Merge git://git.infradead.org/users/willy/linux-nvme

[deliverable/linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 0a5e80fb9ba22beef93722f7bfe83ec33d81ee81..5341d7232c3ac083c2f87c8a3e1098a9c5e8d601 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -28,10 +28,6 @@ config BUILDTIME_EXTABLE_SORT
 
 menu "General setup"
 
-config EXPERIMENTAL
-       bool
-       default y
-
 config BROKEN
        bool
 
@@ -1230,6 +1226,14 @@ config SYSCTL_ARCH_UNALIGN_NO_WARN
          Allows arch to define/use @no_unaligned_warning to possibly warn
          about unaligned access emulation going on under the hood.
 
+config SYSCTL_ARCH_UNALIGN_ALLOW
+       bool
+       help
+         Enable support for /proc/sys/kernel/unaligned-trap
+         Allows arches to define/use @unaligned_enabled to runtime toggle
+         the unaligned access emulation.
+         see arch/parisc/kernel/unaligned.c for reference
+
 config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EXPERT
         default y