Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

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

diff --git a/arch/Kconfig b/arch/Kconfig
index a65eafb24997e547168b152f04f96fe2e1aba01e..8a8ea7110de84482a5c33e53a50d0fc908998f3e 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -221,6 +221,10 @@ config ARCH_TASK_STRUCT_ALLOCATOR
 config ARCH_THREAD_INFO_ALLOCATOR
        bool
 
+# Select if arch wants to size task_struct dynamically via arch_task_struct_size:
+config ARCH_WANTS_DYNAMIC_TASK_STRUCT
+       bool
+
 config HAVE_REGS_AND_STACK_ACCESS_API
        bool
        help
@@ -499,6 +503,13 @@ config ARCH_HAS_ELF_RANDOMIZE
          - arch_mmap_rnd()
          - arch_randomize_brk()
 
+config HAVE_COPY_THREAD_TLS
+       bool
+       help
+         Architecture provides copy_thread_tls to accept tls argument via
+         normal C parameter passing, rather than extracting the syscall
+         argument from pt_regs.
+
 #
 # ABI hall of shame
 #