diff options
author | Wang Nan <wangnan0@huawei.com> | 2014-08-06 19:07:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 21:01:21 -0400 |
commit | f51202de8ffd9dc8ca76ea81a916349138e234ca (patch) | |
tree | 54046310ac915e38877ddb1b5bfc6625b26d2bbf /arch | |
parent | ed562ae6d76dbe409dddedefc94a54673623dcb5 (diff) |
memory-hotplug: ppc: suitable memory should go to ZONE_MOVABLE
This patch introduces zone_for_memory() to arch_add_memory() on powerpc
to ensure new, higher memory added into ZONE_MOVABLE if movable zone has
already setup.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: "Mel Gorman" <mgorman@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/mm/mem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 2c8e90f5789e..e0f7a189c48e 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -128,7 +128,8 @@ int arch_add_memory(int nid, u64 start, u64 size) | |||
128 | return -EINVAL; | 128 | return -EINVAL; |
129 | 129 | ||
130 | /* this should work for most non-highmem platforms */ | 130 | /* this should work for most non-highmem platforms */ |
131 | zone = pgdata->node_zones; | 131 | zone = pgdata->node_zones + |
132 | zone_for_memory(nid, start, size, 0); | ||
132 | 133 | ||
133 | return __add_pages(nid, zone, start_pfn, nr_pages); | 134 | return __add_pages(nid, zone, start_pfn, nr_pages); |
134 | } | 135 | } |