From 71994ada348eae0c399b2282536f27909f4d1975 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 16 Dec 2009 12:20:01 +0100 Subject: [PATCH] --- yaml --- r: 177642 b: refs/heads/master c: 12686d153abff397fa0927c620d5a3de84910b72 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/memory-failure.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8ce1c62cb3d1..9728f3a85f6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d57eb8dfcb92e3dd928d792f4ed2b2fec680bb7 +refs/heads/master: 12686d153abff397fa0927c620d5a3de84910b72 diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c index bcce28755832..006430b972ac 100644 --- a/trunk/mm/memory-failure.c +++ b/trunk/mm/memory-failure.c @@ -1113,7 +1113,8 @@ EXPORT_SYMBOL(unpoison_memory); static struct page *new_page(struct page *p, unsigned long private, int **x) { - return alloc_pages(GFP_HIGHUSER_MOVABLE, 0); + int nid = page_to_nid(p); + return alloc_pages_exact_node(nid, GFP_HIGHUSER_MOVABLE, 0); } /*