Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bfc4113 authored by Wang Nan's avatar Wang Nan Committed by Linus Torvalds
Browse files

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



This patch introduces zone_for_memory() to arch_add_memory() on x86_64
to ensure new, higher memory added into ZONE_MOVABLE if movable zone has
already setup.

Signed-off-by: default avatarWang 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 63264400

arch/x86/mm/init_64.c

+2 −1
Original line number Diff line number Diff line
@@ -691,7 +691,8 @@ static void update_end_of_memory_vars(u64 start, u64 size) 
int arch_add_memory(int nid, u64 start, u64 size)

{

	struct pglist_data *pgdat = NODE_DATA(nid);

	struct zone *zone = pgdat->node_zones + ZONE_NORMAL;

	struct zone *zone = pgdat->node_zones +

		zone_for_memory(nid, start, size, ZONE_NORMAL);

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;

	int ret;