From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andi Kleen <andi@firstfloor•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Hugh Dickins <hugh.dickins@tiscali•co.uk>,
Andrew Morton <akpm@linux-foundation•org>
Subject: linux-next: hwpoison tree build failure
Date: Wed, 16 Dec 2009 17:26:33 +1100 [thread overview]
Message-ID: <20091216172633.93c361ee.sfr@canb.auug.org.au> (raw)
Hi Andi,
Today's linux-next build (x86_64 allmodconfig) failed like this:
mm/memory-failure.c: In function 'soft_offline_page':
mm/memory-failure.c:1266: error: too few arguments to function 'migrate_pages'
Caused by commit c71d409184af558ddac0fd0167061d6282428872 ("HWPOISON: Add
soft page offline support") from the hwpoison tree interacting with
commit 62b61f611eb5e20f7e9f8619bfd03bdfe8af6348 ("ksm: memory hotremove
migration only") from Linus' tree.
I added the following merge fix for today (I don't know if it is correct)
and can carry it for a while:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 16 Dec 2009 17:19:40 +1100
Subject: [PATCH] hwpoison: fix for migrate_pages API change
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
mm/memory-failure.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 7f3f627..bcce287 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1263,7 +1263,7 @@ int soft_offline_page(struct page *page, int flags)
LIST_HEAD(pagelist);
list_add(&page->lru, &pagelist);
- ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL);
+ ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, 0);
if (ret) {
pr_debug("soft offline: %#lx: migration failed %d, type %lx\n",
pfn, ret, page->flags);
--
1.6.5.4
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2009-12-16 6:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-16 6:26 Stephen Rothwell [this message]
2009-12-16 8:49 ` linux-next: hwpoison tree build failure Hugh Dickins
2009-12-16 10:13 ` Andi Kleen
-- strict thread matches above, loose matches on Subject: below --
2009-12-08 8:14 Stephen Rothwell
2009-12-08 9:51 ` Andi Kleen
2009-12-08 23:25 ` Stephen Rothwell
2009-12-09 9:13 ` 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=20091216172633.93c361ee.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andi@firstfloor$(echo .)org \
--cc=hugh.dickins@tiscali$(echo .)co.uk \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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