From: Shaohua Li Date: Fri, 12 Jun 2009 04:57:52 +0000 (+0800) Subject: x86: change kernel_physical_mapping_init() __init to __meminit X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=41d840e224170d2768493e320f290ed060491727;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git x86: change kernel_physical_mapping_init() __init to __meminit kernel_physical_mapping_init() could be called in memory hotplug path. [ Impact: fix potential crash with memory hotplug ] Signed-off-by: Shaohua Li LKML-Reference: <20090612045752.GA827@sli10-desk.sh.intel.com> Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 52bb9519bb86..52e1bff6bfd0 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -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)