Skip to contentSkip to conversation

x64: make one __init to __meminit

PATCH In review Shaohua Li 1 participant 2 messages Jun 12, 2009

Subsystems (2)
lore
Share & tools
lore

Shaohua Li

author
#0 lore raw

PATCH 1/1 x64: make one __init to __meminit

kernel_physical_mapping_init could be called in memory hotplug path.

arch/x86/mm/init_64.c +1 -1
index 52bb951..52e1bff 100644
@@ -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)
#1 lore raw

[tip:x86/urgent] x86: change kernel_physical_mapping_init() __init to __meminit

Commit-ID:  41d840e224170d2768493e320f290ed060491727
Gitweb:     http://git.kernel.org/tip/41d840e224170d2768493e320f290ed060491727
Author:     Shaohua Li <[email protected]>
AuthorDate: Fri, 12 Jun 2009 12:57:52 +0800
Committer:  Ingo Molnar <[email protected]>
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 ]

LKML-Reference: <[email protected]>

---
 arch/x86/mm/init_64.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/mm/init_64.c +1 -1
index 52bb951..52e1bff 100644
@@ -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)