From: Linus Torvalds Date: Wed, 12 Dec 2012 03:59:32 +0000 (-0800) Subject: Merge branch 'x86-nuke386-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~17656 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=743aa456c1834f76982af44e8b71d1a0b2a82e21;p=mirror_ubuntu-focal-kernel.git Merge branch 'x86-nuke386-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull "Nuke 386-DX/SX support" from Ingo Molnar: "This tree removes ancient-386-CPUs support and thus zaps quite a bit of complexity: 24 files changed, 56 insertions(+), 425 deletions(-) ... which complexity has plagued us with extra work whenever we wanted to change SMP primitives, for years. Unfortunately there's a nostalgic cost: your old original 386 DX33 system from early 1991 won't be able to boot modern Linux kernels anymore. Sniff." I'm not sentimental. Good riddance. * 'x86-nuke386-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, 386 removal: Document Nx586 as a 386 and thus unsupported x86, cleanups: Simplify sync_core() in the case of no CPUID x86, 386 removal: Remove CONFIG_X86_POPAD_OK x86, 386 removal: Remove CONFIG_X86_WP_WORKS_OK x86, 386 removal: Remove CONFIG_INVLPG x86, 386 removal: Remove CONFIG_BSWAP x86, 386 removal: Remove CONFIG_XADD x86, 386 removal: Remove CONFIG_CMPXCHG x86, 386 removal: Remove CONFIG_M386 from Kconfig --- 743aa456c1834f76982af44e8b71d1a0b2a82e21 diff --cc arch/x86/include/asm/cpufeature.h index c22a492daf57,ff8dd62fda48..da40b1e2228e --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@@ -311,14 -311,7 +311,8 @@@ extern const char * const x86_power_fla #define cpu_has_cx8 boot_cpu_has(X86_FEATURE_CX8) #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16) #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU) +#define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT) - #if defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_64) - # define cpu_has_invlpg 1 - #else - # define cpu_has_invlpg (boot_cpu_data.x86 > 3) - #endif - #ifdef CONFIG_X86_64 #undef cpu_has_vme