From 363ee26f3a9cbb1e2657b33473562d238b54b9b4 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Wed, 7 Jan 2009 17:26:35 +0530 Subject: [PATCH] --- yaml --- r: 136393 b: refs/heads/master c: dacf7333571d770366bff74d10b56aa545434605 h: refs/heads/master i: 136391: e22dc92425e783edb834c22b894ddddbd313c882 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/smp.h | 2 -- trunk/arch/x86/include/asm/tlbflush.h | 2 ++ trunk/arch/x86/mm/init_32.c | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 02515f76f368..85f1a444811b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7760ec77ab2a9e48bdd0d13341446a8a51f0b9f1 +refs/heads/master: dacf7333571d770366bff74d10b56aa545434605 diff --git a/trunk/arch/x86/include/asm/smp.h b/trunk/arch/x86/include/asm/smp.h index 83a4cc074315..64c9e848f137 100644 --- a/trunk/arch/x86/include/asm/smp.h +++ b/trunk/arch/x86/include/asm/smp.h @@ -22,8 +22,6 @@ extern cpumask_t cpu_callout_map; extern cpumask_t cpu_initialized; extern cpumask_t cpu_callin_map; -extern void zap_low_mappings(void); - extern int __cpuinit get_local_pda(int cpu); extern int smp_num_siblings; diff --git a/trunk/arch/x86/include/asm/tlbflush.h b/trunk/arch/x86/include/asm/tlbflush.h index 0e7bbb549116..aed0b700b837 100644 --- a/trunk/arch/x86/include/asm/tlbflush.h +++ b/trunk/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/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c index f99a6c6c432e..a9dd0b7ad618 100644 --- a/trunk/arch/x86/mm/init_32.c +++ b/trunk/arch/x86/mm/init_32.c @@ -49,7 +49,6 @@ #include #include #include -#include unsigned int __VMALLOC_RESERVE = 128 << 20;