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

[deliverable/linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 366ec06a5185f0a59a7e5069357dbdb3da5a08c8..54ffd0f9df21b7d9f28789104dd48e5bdcf5a965 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -80,6 +80,7 @@ config UPROBES
        bool "Transparent user-space probes (EXPERIMENTAL)"
        depends on UPROBE_EVENT && PERF_EVENTS
        default n
+       select PERCPU_RWSEM
        help
          Uprobes is the user-space counterpart to kprobes: they
          enable instrumentation applications (such as 'perf probe')
@@ -300,15 +301,16 @@ config SECCOMP_FILTER
 
          See Documentation/prctl/seccomp_filter.txt for details.
 
-config HAVE_RCU_USER_QS
+config HAVE_CONTEXT_TRACKING
        bool
        help
-         Provide kernel entry/exit hooks necessary for userspace
-         RCU extended quiescent state. Syscalls need to be wrapped inside
-         rcu_user_exit()-rcu_user_enter() through the slow path using
-         TIF_NOHZ flag. Exceptions handlers must be wrapped as well. Irqs
-         are already protected inside rcu_irq_enter/rcu_irq_exit() but
-         preemption or signal handling on irq exit still need to be protected.
+         Provide kernel/user boundaries probes necessary for subsystems
+         that need it, such as userspace RCU extended quiescent state.
+         Syscalls need to be wrapped inside user_exit()-user_enter() through
+         the slow path using TIF_NOHZ flag. Exceptions handlers must be
+         wrapped as well. Irqs are already protected inside
+         rcu_irq_enter/rcu_irq_exit() but preemption or signal handling on
+         irq exit still need to be protected.
 
 config HAVE_VIRT_CPU_ACCOUNTING
        bool
@@ -341,4 +343,18 @@ config MODULES_USE_ELF_REL
          Modules only use ELF REL relocations.  Modules with ELF RELA
          relocations will give an error.
 
+#
+# ABI hall of shame
+#
+config CLONE_BACKWARDS
+       bool
+       help
+         Architecture has tls passed as the 4th argument of clone(2),
+         not the 5th one.
+
+config CLONE_BACKWARDS2
+       bool
+       help
+         Architecture has the first two arguments of clone(2) swapped.
+
 source "kernel/gcov/Kconfig"