diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2009-06-12 06:57:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-12 14:39:21 +0200 |
| commit | 41d840e224170d2768493e320f290ed060491727 (patch) | |
| tree | f4a29d6f48d98734c9a098f67b6bd3290605055a /arch/x86/mm/init_64.c | |
| parent | x86: Provide _sdata in the vmlinux.lds.S file (diff) | |
| download | linux-41d840e224170d2768493e320f290ed060491727.tar.xz linux-41d840e224170d2768493e320f290ed060491727.zip | |
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@intel.com>
LKML-Reference: <20090612045752.GA827@sli10-desk.sh.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/init_64.c')
| -rw-r--r-- | 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 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) |