Re: linux-next: hwpoison tree build failure

[Hugh Dickins]

On Wed, 16 Dec 2009, Stephen Rothwell wrote:

> 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:

Yes, a 0 there is indeed the right fix: thanks, Stephen.

Hugh

> 
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Wed, 16 Dec 2009 17:19:40 +1100
> Subject: [PATCH] hwpoison: fix for migrate_pages API change
> 
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  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@xxxxxxxxxxxxxxxx
> http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/