From: Ben Hutchings Date: Tue, 25 Sep 2018 18:44:13 +0000 (+0100) Subject: x86-32: Disable 3D-Now in generic config X-Git-Tag: archive/raspbian/5.10.234-1+rpi1^2~51 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=70a61d0ca8de64ff9a8f13c6fc3106be836c6a49;p=linux.git x86-32: Disable 3D-Now in generic config We want the 686 flavour to run on Geode LX and similar AMD family 5 CPUs as well as family 6 and higher CPUs. This used to work with CONFIG_M686=y. However commit 25d76ac88821 "x86/Kconfig: Explicitly enumerate i686-class CPUs in Kconfig" in Linux 4.16 has made the kernel require family 6 or higher. It looks like a sensible choice would be to enable CONFIG_MGEODE_LX and CONFIG_X86_GENERIC (for more generic optimisations), but this currently enables CONFIG_X86_USE_3D_NOW which will cause the kernel to crash on CPUs without the AMD-specific 3D-Now instructions. Make CONFIG_X86_USE_3DNOW depend on CONFIG_X86_GENERIC being disabled. Gbp-Pq: Topic bugfix/x86 Gbp-Pq: Name x86-32-disable-3dnow-in-generic-config.patch --- diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 6f55609ba70..3ef1a8c5a36 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -344,7 +344,7 @@ config X86_USE_PPRO_CHECKSUM config X86_USE_3DNOW def_bool y - depends on (MCYRIXIII || MK7 || MGEODE_LX) && !UML + depends on (MCYRIXIII || MK7 || MGEODE_LX) && !X86_GENERIC && !UML # # P6_NOPs are a relatively minor optimization that require a family >=