Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index b16e74e4b5afbbcfad4091c4067c638d2e50da3c..15996290fed4a920f22e2687cb77944e9c3b3cfc 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -226,8 +226,8 @@ config ARCH_INIT_TASK
 config ARCH_TASK_STRUCT_ALLOCATOR
        bool
 
-# Select if arch has its private alloc_thread_info() function
-config ARCH_THREAD_INFO_ALLOCATOR
+# Select if arch has its private alloc_thread_stack() function
+config ARCH_THREAD_STACK_ALLOCATOR
        bool
 
 # Select if arch wants to size task_struct dynamically via arch_task_struct_size:
@@ -598,6 +598,17 @@ config HAVE_STACK_VALIDATION
          Architecture supports the 'objtool check' host tool command, which
          performs compile-time stack metadata validation.
 
+config HAVE_ARCH_HASH
+       bool
+       default n
+       help
+         If this is set, the architecture provides an <asm/hash.h>
+         file which provides platform-specific implementations of some
+         functions in <linux/hash.h> or fs/namei.c.
+
+config ISA_BUS_API
+       def_bool ISA
+
 #
 # ABI hall of shame
 #