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/kernel/cpu | |
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/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 3 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/intel.c | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 1b7d1656a04..a025d8cc457 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -753,9 +753,6 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, | |||
753 | 753 | ||
754 | static void __cpuinit cpu_set_tlb_flushall_shift(struct cpuinfo_x86 *c) | 754 | static void __cpuinit cpu_set_tlb_flushall_shift(struct cpuinfo_x86 *c) |
755 | { | 755 | { |
756 | if (!cpu_has_invlpg) | ||
757 | return; | ||
758 | |||
759 | tlb_flushall_shift = 5; | 756 | tlb_flushall_shift = 5; |
760 | 757 | ||
761 | if (c->x86 <= 0x11) | 758 | if (c->x86 <= 0x11) |
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 198e019a531..fcaabd0432c 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c | |||
@@ -612,10 +612,6 @@ static void __cpuinit intel_tlb_lookup(const unsigned char desc) | |||
612 | 612 | ||
613 | static void __cpuinit intel_tlb_flushall_shift_set(struct cpuinfo_x86 *c) | 613 | static void __cpuinit intel_tlb_flushall_shift_set(struct cpuinfo_x86 *c) |
614 | { | 614 | { |
615 | if (!cpu_has_invlpg) { | ||
616 | tlb_flushall_shift = -1; | ||
617 | return; | ||
618 | } | ||
619 | switch ((c->x86 << 8) + c->x86_model) { | 615 | switch ((c->x86 << 8) + c->x86_model) { |
620 | case 0x60f: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ | 616 | case 0x60f: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ |
621 | case 0x616: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ | 617 | case 0x616: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ |