diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2009-06-12 00:57:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-12 08:39:21 -0400 |
| commit | 41d840e224170d2768493e320f290ed060491727 (patch) | |
| tree | f4a29d6f48d98734c9a098f67b6bd3290605055a /arch | |
| parent | 1260866a271abc84274345580f3d613d3bceff87 (diff) | |
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')
| -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, | |||
| 527 | return phys_pud_init(pud, addr, end, page_size_mask); | 527 | return phys_pud_init(pud, addr, end, page_size_mask); |
| 528 | } | 528 | } |
| 529 | 529 | ||
| 530 | unsigned long __init | 530 | unsigned long __meminit |
| 531 | kernel_physical_mapping_init(unsigned long start, | 531 | kernel_physical_mapping_init(unsigned long start, |
| 532 | unsigned long end, | 532 | unsigned long end, |
| 533 | unsigned long page_size_mask) | 533 | unsigned long page_size_mask) |