diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-20 10:50:58 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-20 10:50:58 +1100 |
commit | 566c202e7417a9d48038d82d02ba35d1a43adf4d (patch) | |
tree | 2b43d7dd0e4e4b948668ef3b2ff2a505e65376af /init | |
parent | 26ab9a28eba703cf03a7be272768c2954e7f83ae (diff) | |
parent | c9500a763ce7a88d6b9648a12038d02ae6724d58 (diff) |
Merge remote-tracking branch 'ia64/next'
Conflicts:
drivers/firmware/efivars.c
init/Kconfig
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 01180da49add..cab5a6c0506d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1240,6 +1240,13 @@ config SYSCTL_ARCH_UNALIGN_ALLOW the unaligned access emulation. see arch/parisc/kernel/unaligned.c for reference +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 |