Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-zesty-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 335a1f680c918058e6ac4b12dadabd8f17294fb8..28c5b9dcc91e81bfba954bf0ebc26b476dc7b312 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1229,6 +1229,13 @@ config SYSCTL_EXCEPTION_TRACE
        help
          Enable support for /proc/sys/debug/exception-trace.
 
+config SYSCTL_ARCH_UNALIGN_NO_WARN
+       bool
+       help
+         Enable support for /proc/sys/kernel/ignore-unaligned-usertrap
+         Allows arch to define/use @no_unaligned_warning to possibly warn
+         about unaligned access emulation going on under the hood.
+
 config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EXPERT
         default y