diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2012-11-28 14:50:27 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-11-29 16:23:02 -0500 |
commit | 094ab1db7cb7833cd4c820acd868fc26acf3f08e (patch) | |
tree | 8f68b528df0673c9a2d98a72d7bca18ca8c5045c /arch/x86/include/asm | |
parent | e5bb8ad862a97a0facc83f3b81731de919fec6ad (diff) |
x86, 386 removal: Remove CONFIG_INVLPG
All 486+ CPUs support INVLPG, so remove the fallback 386 support
code.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Link: http://lkml.kernel.org/r/1354132230-21854-6-git-send-email-hpa@linux.intel.com
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r-- | arch/x86/include/asm/cpufeature.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/tlbflush.h | 3 |
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 8c297aa53eef..ff8dd62fda48 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h | |||
@@ -312,12 +312,6 @@ extern const char * const x86_power_flags[32]; | |||
312 | #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16) | 312 | #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16) |
313 | #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU) | 313 | #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU) |
314 | 314 | ||
315 | #if defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_64) | ||
316 | # define cpu_has_invlpg 1 | ||
317 | #else | ||
318 | # define cpu_has_invlpg (boot_cpu_data.x86 > 3) | ||
319 | #endif | ||
320 | |||
321 | #ifdef CONFIG_X86_64 | 315 | #ifdef CONFIG_X86_64 |
322 | 316 | ||
323 | #undef cpu_has_vme | 317 | #undef cpu_has_vme |
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h index 74a44333545a..0fee48e279cc 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h | |||
@@ -56,10 +56,7 @@ static inline void __flush_tlb_all(void) | |||
56 | 56 | ||
57 | static inline void __flush_tlb_one(unsigned long addr) | 57 | static inline void __flush_tlb_one(unsigned long addr) |
58 | { | 58 | { |
59 | if (cpu_has_invlpg) | ||
60 | __flush_tlb_single(addr); | 59 | __flush_tlb_single(addr); |
61 | else | ||
62 | __flush_tlb(); | ||
63 | } | 60 | } |
64 | 61 | ||
65 | #define TLB_FLUSH_ALL -1UL | 62 | #define TLB_FLUSH_ALL -1UL |