From: Shaohua Li Date: Mon, 27 Oct 2008 20:03:18 +0000 (-0700) Subject: x86, memory hotplug: remove wrong -1 in calling init_memory_mapping() X-Git-Tag: v2.6.28-rc3~91^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=60817c9b31ef7897d60bca2f384cbc316a3fdd8b;p=linux-2.6-omap-h63xx.git x86, memory hotplug: remove wrong -1 in calling init_memory_mapping() Impact: fix crash with memory hotplug Shuahua Li found: | I just did some experiments on a desktop for memory hotplug and this bug | triggered a crash in my test. | | Yinghai's suggestion also fixed the bug. We don't need to round it, just remove that extra -1 Signed-off-by: Yinghai Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index c7a4c5a9a21..f79a02f64d1 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -837,7 +837,7 @@ int arch_add_memory(int nid, u64 start, u64 size) unsigned long nr_pages = size >> PAGE_SHIFT; int ret; - last_mapped_pfn = init_memory_mapping(start, start + size-1); + last_mapped_pfn = init_memory_mapping(start, start + size); if (last_mapped_pfn > max_pfn_mapped) max_pfn_mapped = last_mapped_pfn;