diff options
author | Yasunori Goto <y-goto@jp.fujitsu.com> | 2007-05-08 03:23:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:14:57 -0400 |
commit | a3142c8e1dd57ff48040bdb3478cff9312543dc3 (patch) | |
tree | 14beeb03421338b917a956e9269a2ce95e0f62cf /arch/x86_64 | |
parent | 0ceb331433e8aad9c5f441a965d7c681f8b9046f (diff) |
Fix section mismatch of memory hotplug related code.
This is to fix many section mismatches of code related to memory hotplug.
I checked compile with memory hotplug on/off on ia64 and x86-64 box.
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/mm/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c index c0822683b916..1336da8bdee1 100644 --- a/arch/x86_64/mm/init.c +++ b/arch/x86_64/mm/init.c | |||
@@ -172,7 +172,7 @@ __set_fixmap (enum fixed_addresses idx, unsigned long phys, pgprot_t prot) | |||
172 | set_pte_phys(address, phys, prot); | 172 | set_pte_phys(address, phys, prot); |
173 | } | 173 | } |
174 | 174 | ||
175 | unsigned long __initdata table_start, table_end; | 175 | unsigned long __meminitdata table_start, table_end; |
176 | 176 | ||
177 | static __meminit void *alloc_low_page(unsigned long *phys) | 177 | static __meminit void *alloc_low_page(unsigned long *phys) |
178 | { | 178 | { |
@@ -204,7 +204,7 @@ static __meminit void unmap_low_page(void *adr) | |||
204 | } | 204 | } |
205 | 205 | ||
206 | /* Must run before zap_low_mappings */ | 206 | /* Must run before zap_low_mappings */ |
207 | __init void *early_ioremap(unsigned long addr, unsigned long size) | 207 | __meminit void *early_ioremap(unsigned long addr, unsigned long size) |
208 | { | 208 | { |
209 | unsigned long vaddr; | 209 | unsigned long vaddr; |
210 | pmd_t *pmd, *last_pmd; | 210 | pmd_t *pmd, *last_pmd; |
@@ -233,7 +233,7 @@ __init void *early_ioremap(unsigned long addr, unsigned long size) | |||
233 | } | 233 | } |
234 | 234 | ||
235 | /* To avoid virtual aliases later */ | 235 | /* To avoid virtual aliases later */ |
236 | __init void early_iounmap(void *addr, unsigned long size) | 236 | __meminit void early_iounmap(void *addr, unsigned long size) |
237 | { | 237 | { |
238 | unsigned long vaddr; | 238 | unsigned long vaddr; |
239 | pmd_t *pmd; | 239 | pmd_t *pmd; |