lkml.org 
[lkml]   [2015]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC][PATCH] x86: Cleanup Kconfig

    While looking at arch/x86/Kconfig I noticed a lot of if X86_{32,64}
    clauses in the X86 symbol. Its much simpler to simply but these selects
    in the right symbol and do away with the conditionals.

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    ---
    arch/x86/Kconfig | 30 +++++++++++++++---------------
    1 file changed, 15 insertions(+), 15 deletions(-)

    diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
    index 8fec04407245..a259db4cfe8c 100644
    --- a/arch/x86/Kconfig
    +++ b/arch/x86/Kconfig
    @@ -11,6 +11,12 @@ config X86_32
    depends on !64BIT
    select CLKSRC_I8253
    select HAVE_UID16
    + select HAVE_AOUT
    + select HAVE_GENERIC_DMA_COHERENT
    + select ARCH_WANT_IPC_PARSE_VERSION
    + select MODULES_USE_ELF_REL
    + select CLONE_BACKWARDS
    + select OLD_SIGACTION

    config X86_64
    def_bool y
    @@ -18,6 +24,15 @@ config X86_64
    select X86_DEV_DMA_OPS
    select ARCH_USE_CMPXCHG_LOCKREF
    select HAVE_LIVEPATCH
    + select ARCH_SUPPORTS_NUMA_BALANCING
    + select ARCH_SUPPORTS_INT128
    + select HAVE_FENTRY
    + select HAVE_ARCH_KASAN if SPARSEMEM_VMEMMAP
    + select HAVE_BPF_JIT
    + select HAVE_ARCH_SOFT_DIRTY
    + select HAVE_CONTEXT_TRACKING
    + select MODULES_USE_ELF_RELA
    + select HAVE_IRQ_EXIT_ON_IRQ_STACK

    ### Arch settings
    config X86
    @@ -29,10 +44,7 @@ config X86
    select ARCH_HAS_GCOV_PROFILE_ALL
    select ARCH_MIGHT_HAVE_PC_PARPORT
    select ARCH_MIGHT_HAVE_PC_SERIO
    - select HAVE_AOUT if X86_32
    select HAVE_UNSTABLE_SCHED_CLOCK
    - select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
    - select ARCH_SUPPORTS_INT128 if X86_64
    select HAVE_IDE
    select HAVE_OPROFILE
    select HAVE_PCSPKR_PLATFORM
    @@ -51,7 +63,6 @@ config X86
    select HAVE_OPTPROBES
    select HAVE_KPROBES_ON_FTRACE
    select HAVE_FTRACE_MCOUNT_RECORD
    - select HAVE_FENTRY if X86_64
    select HAVE_C_RECORDMCOUNT
    select HAVE_DYNAMIC_FTRACE
    select HAVE_DYNAMIC_FTRACE_WITH_REGS
    @@ -63,7 +74,6 @@ config X86
    select HAVE_KVM
    select HAVE_ARCH_KGDB
    select HAVE_ARCH_TRACEHOOK
    - select HAVE_GENERIC_DMA_COHERENT if X86_32
    select HAVE_EFFICIENT_UNALIGNED_ACCESS
    select USER_STACKTRACE_SUPPORT
    select HAVE_REGS_AND_STACK_ACCESS_API
    @@ -86,7 +96,6 @@ config X86
    select HAVE_CMPXCHG_LOCAL
    select HAVE_CMPXCHG_DOUBLE
    select HAVE_ARCH_KMEMCHECK
    - select HAVE_ARCH_KASAN if X86_64 && SPARSEMEM_VMEMMAP
    select HAVE_USER_RETURN_NOTIFIER
    select ARCH_HAS_ELF_RANDOMIZE
    select HAVE_ARCH_JUMP_LABEL
    @@ -98,7 +107,6 @@ config X86
    select GENERIC_IRQ_SHOW
    select GENERIC_CLOCKEVENTS_MIN_ADJUST
    select IRQ_FORCED_THREADING
    - select HAVE_BPF_JIT if X86_64
    select HAVE_ARCH_TRANSPARENT_HUGEPAGE
    select HAVE_ARCH_HUGE_VMAP if X86_64 || (X86_32 && X86_PAE)
    select ARCH_HAS_SG_CHAIN
    @@ -107,11 +115,9 @@ config X86
    select GENERIC_IOMAP
    select DCACHE_WORD_ACCESS
    select GENERIC_SMP_IDLE_THREAD
    - select ARCH_WANT_IPC_PARSE_VERSION if X86_32
    select HAVE_ARCH_SECCOMP_FILTER
    select BUILDTIME_EXTABLE_SORT
    select GENERIC_CMOS_UPDATE
    - select HAVE_ARCH_SOFT_DIRTY if X86_64
    select CLOCKSOURCE_WATCHDOG
    select GENERIC_CLOCKEVENTS
    select ARCH_CLOCKSOURCE_DATA
    @@ -120,21 +126,15 @@ config X86
    select GENERIC_TIME_VSYSCALL
    select GENERIC_STRNCPY_FROM_USER
    select GENERIC_STRNLEN_USER
    - select HAVE_CONTEXT_TRACKING if X86_64
    select HAVE_IRQ_TIME_ACCOUNTING
    select VIRT_TO_BUS
    - select MODULES_USE_ELF_REL if X86_32
    - select MODULES_USE_ELF_RELA if X86_64
    - select CLONE_BACKWARDS if X86_32
    select ARCH_USE_BUILTIN_BSWAP
    select ARCH_USE_QUEUED_SPINLOCKS
    select ARCH_USE_QUEUED_RWLOCKS
    select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION
    - select OLD_SIGACTION if X86_32
    select COMPAT_OLD_SIGACTION if IA32_EMULATION
    select RTC_LIB
    select HAVE_DEBUG_STACKOVERFLOW
    - select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
    select HAVE_CC_STACKPROTECTOR
    select GENERIC_CPU_AUTOPROBE
    select HAVE_ARCH_AUDITSYSCALL

    \
     
     \ /
      Last update: 2015-06-02 12:01    [W:2.482 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site