diff options
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
-rw-r--r-- | arch/x86/kernel/cpu/intel.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index a80029035bf2..cd61755de49b 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c | |||
@@ -634,31 +634,6 @@ static void intel_tlb_lookup(const unsigned char desc) | |||
634 | } | 634 | } |
635 | } | 635 | } |
636 | 636 | ||
637 | static void intel_tlb_flushall_shift_set(struct cpuinfo_x86 *c) | ||
638 | { | ||
639 | switch ((c->x86 << 8) + c->x86_model) { | ||
640 | case 0x60f: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ | ||
641 | case 0x616: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ | ||
642 | case 0x617: /* current 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ | ||
643 | case 0x61d: /* six-core 45 nm xeon "Dunnington" */ | ||
644 | tlb_flushall_shift = -1; | ||
645 | break; | ||
646 | case 0x63a: /* Ivybridge */ | ||
647 | tlb_flushall_shift = 2; | ||
648 | break; | ||
649 | case 0x61a: /* 45 nm nehalem, "Bloomfield" */ | ||
650 | case 0x61e: /* 45 nm nehalem, "Lynnfield" */ | ||
651 | case 0x625: /* 32 nm nehalem, "Clarkdale" */ | ||
652 | case 0x62c: /* 32 nm nehalem, "Gulftown" */ | ||
653 | case 0x62e: /* 45 nm nehalem-ex, "Beckton" */ | ||
654 | case 0x62f: /* 32 nm Xeon E7 */ | ||
655 | case 0x62a: /* SandyBridge */ | ||
656 | case 0x62d: /* SandyBridge, "Romely-EP" */ | ||
657 | default: | ||
658 | tlb_flushall_shift = 6; | ||
659 | } | ||
660 | } | ||
661 | |||
662 | static void intel_detect_tlb(struct cpuinfo_x86 *c) | 637 | static void intel_detect_tlb(struct cpuinfo_x86 *c) |
663 | { | 638 | { |
664 | int i, j, n; | 639 | int i, j, n; |
@@ -683,7 +658,6 @@ static void intel_detect_tlb(struct cpuinfo_x86 *c) | |||
683 | for (j = 1 ; j < 16 ; j++) | 658 | for (j = 1 ; j < 16 ; j++) |
684 | intel_tlb_lookup(desc[j]); | 659 | intel_tlb_lookup(desc[j]); |
685 | } | 660 | } |
686 | intel_tlb_flushall_shift_set(c); | ||
687 | } | 661 | } |
688 | 662 | ||
689 | static const struct cpu_dev intel_cpu_dev = { | 663 | static const struct cpu_dev intel_cpu_dev = { |