From: Arnd Bergmann <[email protected]> There is one more leftover line in Kconfig and the detection for AMD Generation 4 CPUs (5k86 and Élan) that can now get removed following the increase of the minimum CPU level to 586TSC.
Signed-off-by: Arnd Bergmann <[email protected]> --- arch/x86/Kconfig.cpu | 1 - arch/x86/kernel/cpu/amd.c | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 1377edd9a997..f4a12b74bed3 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -32,7 +32,6 @@ choice - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird). - "Crusoe" for the Transmeta Crusoe series. - "Efficeon" for the Transmeta Efficeon series. - - "AMD Elan" for the 32-bit AMD Elan embedded CPU. - "GeodeGX1" for Geode GX1 (Cyrix MediaGX). - "Geode GX/LX" For AMD Geode GX and LX processors. - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3. diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 62f74a7f2f8d..b04e1f6fe430 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -91,25 +91,6 @@ __asm__(".text\n" "vide: ret\n"); #endif -static void init_amd_k5(struct cpuinfo_x86 *c) -{ -#ifdef CONFIG_X86_32 -/* - * General Systems BIOSen alias the cpu frequency registers - * of the Elan at 0x000df000. Unfortunately, one of the Linux - * drivers subsequently pokes it, and changes the CPU speed. - * Workaround : Remove the unneeded alias. - */ -#define CBAR (0xfffc) /* Configuration Base Address (32-bit) */ -#define CBAR_ENB (0x80000000) -#define CBAR_KEY (0X000000CB) - if (c->x86_model == 9 || c->x86_model == 10) { - if (inl(CBAR) & CBAR_ENB) - outl(0 | CBAR_KEY, CBAR); - } -#endif -} - static void init_amd_k6(struct cpuinfo_x86 *c) { #ifdef CONFIG_X86_32 @@ -1065,7 +1046,6 @@ static void init_amd(struct cpuinfo_x86 *c) clear_cpu_cap(c, X86_FEATURE_MCE); switch (c->x86) { - case 4: init_amd_k5(c); break; case 5: init_amd_k6(c); break; case 6: init_amd_k7(c); break; case 0xf: init_amd_k8(c); break; -- 2.39.5
