Commit-ID: 41d840e224170d2768493e320f290ed060491727 Gitweb: http://git.kernel.org/tip/41d840e224170d2768493e320f290ed060491727 Author: Shaohua Li <shaohua.li@xxxxxxxxx> AuthorDate: Fri, 12 Jun 2009 12:57:52 +0800 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Fri, 12 Jun 2009 14:39:21 +0200 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 <shaohua.li@xxxxxxxxx> LKML-Reference: <20090612045752.GA827@xxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/x86/mm/init_64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 52bb951..52e1bff 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) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|