aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWang Nan <wangnan0@huawei.com>2014-08-06 19:07:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-06 21:01:21 -0400
commit03d4be64603e2dc1bfa624bc436869d73340723e (patch)
tree41519f956a800c0f3ede07afb06e9393a516fee0 /arch
parent9bfc41138525c51955cd35cbca56f8cd757a73f8 (diff)
memory-hotplug: x86_32: suitable memory should go to ZONE_MOVABLE
This patch introduces zone_for_memory() to arch_add_memory() on x86_32 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/x86/mm/init_32.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index e39504878aec..7d05565ba781 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -825,7 +825,8 @@ void __init mem_init(void)
825int arch_add_memory(int nid, u64 start, u64 size) 825int arch_add_memory(int nid, u64 start, u64 size)
826{ 826{
827 struct pglist_data *pgdata = NODE_DATA(nid); 827 struct pglist_data *pgdata = NODE_DATA(nid);
828 struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM; 828 struct zone *zone = pgdata->node_zones +
829 zone_for_memory(nid, start, size, ZONE_HIGHMEM);
829 unsigned long start_pfn = start >> PAGE_SHIFT; 830 unsigned long start_pfn = start >> PAGE_SHIFT;
830 unsigned long nr_pages = size >> PAGE_SHIFT; 831 unsigned long nr_pages = size >> PAGE_SHIFT;
831 832