]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 13 Dec 2008 23:29:31 +0000 (15:29 -0800)
commit 60817c9b31ef7897d60bca2f384cbc316a3fdd8b upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/x86/mm/init_64.c

index d3746efb060d1602a9de63d3be955522f0cd2a5d..25a44c7b57e9000afb96da694328070bb95cacb3 100644 (file)
@@ -721,7 +721,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;