Commit 6e90b58b authored Aug 06, 2014 by Wang Nan Committed by Linus Torvalds Aug 06, 2014

memory-hotplug: sh: suitable memory should go to ZONE_MOVABLE

This patch introduces zone_for_memory() to arch_add_memory() on sh 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>

parent f51202de

arch/sh/mm/init.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -495,7 +495,8 @@ int arch_add_memory(int nid, u64 start, u64 size)
		pgdat = NODE_DATA(nid);

		/* We only have ZONE_NORMAL, so this is easy.. */
		ret = __add_pages(nid, pgdat->node_zones + ZONE_NORMAL,
		ret = __add_pages(nid, pgdat->node_zones +
		zone_for_memory(nid, start, size, ZONE_NORMAL),
		start_pfn, nr_pages);
		if (unlikely(ret))
		printk("%s: Failed, __add_pages() == %d\n", __func__, ret);

Admin message