]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86, memory hotplug: remove wrong -1 in calling init_memory_mapping()
authorShaohua Li <shaohua.li@intel.com>
Mon, 27 Oct 2008 20:03:18 +0000 (13:03 -0700)
committerIngo Molnar <mingo@elte.hu>
Tue, 28 Oct 2008 08:33:17 +0000 (09:33 +0100)
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 <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/mm/init_64.c

index c7a4c5a9a21bf7663df9ea6ecf10ec82a83efcf1..f79a02f64d108dde4de4a35055240f64fae2371b 100644 (file)
@@ -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;