From: Andi Kleen <ak@linux•intel.com>
To: Heiko Carstens <heiko.carstens@de•ibm.com>
Cc: Naoya Horiguchi <n-horiguchi@ah•jp.nec.com>,
linux-next@vger•kernel.org,
Jun'ichi Nomura <j-nomura@ce•jp.nec.com>,
Mel Gorman <mel@csn•ul.ie>,
Martin Schwidefsky <schwidefsky@de•ibm.com>
Subject: Re: linux-next: "hugetlb: hugepage migration core" breaks compilation on s390
Date: Mon, 11 Oct 2010 16:08:34 +0200 [thread overview]
Message-ID: <20101011140834.GA7962@gargoyle.fritz.box> (raw)
In-Reply-To: <20101011111131.GA10270@osiris.boeblingen.de.ibm.com>
On Mon, Oct 11, 2010 at 01:11:31PM +0200, Heiko Carstens wrote:
> "hugetlb: hugepage migration core" in linux-next breaks compilation on s390:
>
> CC mm/migrate.o
> mm/migrate.c: In function 'remove_migration_pte':
> mm/migrate.c:143:3: error: implicit declaration of function 'pte_mkhuge'
> mm/migrate.c:143:7: error: incompatible types when assigning to type 'pte_t' from type 'int'
> make[1]: *** [mm/migrate.o] Error 1
> make: *** [mm/migrate.o] Error 2
>
> This is simply because a lot of CONFIG_HUGETLB_PAGE dependent code was added
> to mm/migration.c which does not depend on that config option. Please fix.
Most of the functions have inline dummies, just pte_mkhuge() doesn't.
Anyways the easiest fix would be a simple #ifdef. Does this patch
work for you?
-Andi
From: Andi Kleen <ak@linux•intel.com>
Subject: [PATCH] Fix migration.c compilation on s390
s390 doesn't have huge pages and failed with
> mm/migrate.c: In function 'remove_migration_pte':
> mm/migrate.c:143:3: error: implicit declaration of function 'pte_mkhuge'
> mm/migrate.c:143:7: error: incompatible types when assigning to type 'pte_t' from type 'int'
Put that code into a ifdef.
Reported by Heiko Carstens
Signed-off-by: Andi Kleen <ak@linux•intel.com>
diff --git a/mm/migrate.c b/mm/migrate.c
index 55dbc45..f8c9bcc 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -139,8 +139,10 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma,
pte = pte_mkold(mk_pte(new, vma->vm_page_prot));
if (is_write_migration_entry(entry))
pte = pte_mkwrite(pte);
+#ifdef CONFIG_HUGETLB_PAGE
if (PageHuge(new))
pte = pte_mkhuge(pte);
+#endif
flush_cache_page(vma, addr, pte_pfn(pte));
set_pte_at(mm, addr, ptep, pte);
next prev parent reply other threads:[~2010-10-11 14:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-11 11:11 linux-next: "hugetlb: hugepage migration core" breaks compilation on s390 Heiko Carstens
2010-10-11 14:08 ` Andi Kleen [this message]
2010-10-11 14:22 ` Heiko Carstens
2010-10-11 14:59 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101011140834.GA7962@gargoyle.fritz.box \
--to=ak@linux$(echo .)intel.com \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=j-nomura@ce$(echo .)jp.nec.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mel@csn$(echo .)ul.ie \
--cc=n-horiguchi@ah$(echo .)jp.nec.com \
--cc=schwidefsky@de$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox