powerpc/book3s64/radix: Rename CPU_FTR_P9_TLBIE_BUG feature flag

[linux-2.6-block.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 71d9ae0c0ea16ea8990e1a81841d5bb31b77a07d..0fcf8ec1e09883a2fbab69f02f02068dd913afc3 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -106,7 +106,7 @@ config STATIC_KEYS_SELFTEST
 config OPTPROBES
        def_bool y
        depends on KPROBES && HAVE_OPTPROBES
-       select TASKS_RCU if PREEMPT
+       select TASKS_RCU if PREEMPTION
 
 config KPROBES_ON_FTRACE
        def_bool y
@@ -292,6 +292,13 @@ config ARCH_32BIT_OFF_T
          still support 32-bit off_t. This option is enabled for all such
          architectures explicitly.
 
+config HAVE_ASM_MODVERSIONS
+       bool
+       help
+         This symbol should be selected by an architecure if it provides
+         <asm/asm-prototypes.h> to support the module versioning for symbols
+         exported from assembly code.
+
 config HAVE_REGS_AND_STACK_ACCESS_API
        bool
        help
@@ -793,9 +800,6 @@ config COMPAT_32BIT_TIME
          This is relevant on all 32-bit architectures, and 64-bit architectures
          as part of compat syscall handling.
 
-config ARCH_NO_COHERENT_DMA_MMAP
-       bool
-
 config ARCH_NO_PREEMPT
        bool
 
@@ -942,6 +946,9 @@ config RELR
          well as compatible NM and OBJCOPY utilities (llvm-nm and llvm-objcopy
          are compatible).
 
+config ARCH_HAS_MEM_ENCRYPT
+       bool
+
 source "kernel/gcov/Kconfig"
 
 source "scripts/gcc-plugins/Kconfig"