Merge tag 'arc-v3.9-rc1-late' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[~andy/linux] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 0a5e80fb9ba22beef93722f7bfe83ec33d81ee81..22616cd434bc7d91d157074eb0cf9c9ce9b9f0f0 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1230,6 +1230,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