diff options
| -rw-r--r-- | arch/x86/Kconfig.cpufeatures | 2 | ||||
| -rw-r--r-- | arch/x86/Makefile_32.cpu | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/Kconfig.cpufeatures b/arch/x86/Kconfig.cpufeatures index 733d5aff2456..b435952249a0 100644 --- a/arch/x86/Kconfig.cpufeatures +++ b/arch/x86/Kconfig.cpufeatures @@ -38,7 +38,7 @@ config X86_REQUIRED_FEATURE_ALWAYS config X86_REQUIRED_FEATURE_NOPL def_bool y - depends on X86_64 || X86_P6_NOP + depends on X86_64 config X86_REQUIRED_FEATURE_CX8 def_bool y diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu index af7de9a42752..a3dda95e47f4 100644 --- a/arch/x86/Makefile_32.cpu +++ b/arch/x86/Makefile_32.cpu @@ -42,9 +42,3 @@ cflags-$(CONFIG_MGEODE_LX) += $(call cc-option,-march=geode,-march=pentium-mmx) # add at the end to overwrite eventual tuning options from earlier # cpu entries cflags-$(CONFIG_X86_GENERIC) += $(call tune,generic,$(call tune,i686)) - -# Bug fix for binutils: this option is required in order to keep -# binutils from generating NOPL instructions against our will. -ifneq ($(CONFIG_X86_P6_NOP),y) -cflags-y += $(call cc-option,-Wa$(comma)-mtune=generic32,) -endif |