2009-01-07 12:01:16

by Jaswinder Singh Rajput

[permalink] [raw]
Subject: [PATCH -tip 2/7] x86: smp.h move zap_low_mappings declartion to tlbflush.h

Impact: cleanup, moving NON-SMP stuff from smp.h

Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
arch/x86/include/asm/smp.h | 2 --
arch/x86/include/asm/tlbflush.h | 2 ++
arch/x86/mm/init_32.c | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 643a3a0..d2ab0ed 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -39,8 +39,6 @@ extern cpumask_t cpu_sibling_setup_map;

#endif /* CONFIG_X86_32 */

-extern void zap_low_mappings(void);
-
extern int __cpuinit get_local_pda(int cpu);

extern int smp_num_siblings;
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index 0e7bbb5..aed0b70 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -175,4 +175,6 @@ static inline void flush_tlb_kernel_range(unsigned long start,
flush_tlb_all();
}

+extern void zap_low_mappings(void);
+
#endif /* _ASM_X86_TLBFLUSH_H */
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index e47efd9..6b1bedc 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -49,7 +49,6 @@
#include <asm/paravirt.h>
#include <asm/setup.h>
#include <asm/cacheflush.h>
-#include <asm/smp.h>

unsigned int __VMALLOC_RESERVE = 128 << 20;

--
1.5.6.6