]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
x86: change kernel_physical_mapping_init() __init to __meminit
authorShaohua Li <shaohua.li@intel.com>
Fri, 12 Jun 2009 04:57:52 +0000 (12:57 +0800)
committerIngo Molnar <mingo@elte.hu>
Fri, 12 Jun 2009 12:39:21 +0000 (14:39 +0200)
kernel_physical_mapping_init() could be called in memory hotplug path.

[ Impact: fix potential crash with memory hotplug ]

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
LKML-Reference: <20090612045752.GA827@sli10-desk.sh.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/mm/init_64.c

index 52bb9519bb86b4ec778d613939ea658adb1052a6..52e1bff6bfd0165f7d8fa4ad829d6a62cbf85f3d 100644 (file)
@@ -527,7 +527,7 @@ phys_pud_update(pgd_t *pgd, unsigned long addr, unsigned long end,
        return phys_pud_init(pud, addr, end, page_size_mask);
 }
 
-unsigned long __init
+unsigned long __meminit
 kernel_physical_mapping_init(unsigned long start,
                             unsigned long end,
                             unsigned long page_size_mask)