2009-06-12 04:57:58

by Shaohua Li

Subject: [PATCH trival]x64: make one __init to __meminit

kernel_physical_mapping_init could be called in memory hotplug path.

Signed-off-by: Shaohua Li <[email protected]>

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)

2009-06-12 12:44:35

by Shaohua Li

Subject: [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 ]

Signed-off-by: Shaohua Li <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>


---
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)