]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
x86/kconfig: Clean up IA32_EMULATION select
authorIngo Molnar <mingo@kernel.org>
Tue, 15 Nov 2016 09:22:52 +0000 (10:22 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 15 Nov 2016 09:52:21 +0000 (10:52 +0100)
Move a 'if IA32_EMULATION' select from the generic X86 section
to the IA32_EMULATION option.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/Kconfig

index efd35b1b68063570cc1f6f2f0d219902553e8485..208577cc6d4a5841a11c080ed387c210dd90311c 100644 (file)
@@ -69,7 +69,6 @@ config X86
        select CLKEVT_I8253
        select CLOCKSOURCE_VALIDATE_LAST_CYCLE
        select CLOCKSOURCE_WATCHDOG
-       select COMPAT_OLD_SIGACTION             if IA32_EMULATION
        select DCACHE_WORD_ACCESS
        select EDAC_ATOMIC_SCRUB
        select EDAC_SUPPORT
@@ -2701,9 +2700,10 @@ source "fs/Kconfig.binfmt"
 config IA32_EMULATION
        bool "IA32 Emulation"
        depends on X86_64
+       select ARCH_WANT_OLD_COMPAT_IPC
        select BINFMT_ELF
        select COMPAT_BINFMT_ELF
-       select ARCH_WANT_OLD_COMPAT_IPC
+       select COMPAT_OLD_SIGACTION
        ---help---
          Include code to run legacy 32-bit programs under a
          64-bit kernel. You should likely turn this on, unless you're