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

[deliverable/linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 8f3638674e05ac642484712b5e347ebdf7212665..8f35649305804c913efe1501e486ddb465e12810 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -71,6 +71,12 @@ config JUMP_LABEL
         ( On 32-bit x86, the necessary options added to the compiler
           flags may increase the size of the kernel slightly. )
 
+config STATIC_KEYS_SELFTEST
+       bool "Static key selftest"
+       depends on JUMP_LABEL
+       help
+         Boot time self-test of the branch patching code.
+
 config OPTPROBES
        def_bool y
        depends on KPROBES && HAVE_OPTPROBES