diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:55:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:55:48 -0500 |
| commit | 27ea6dfdc23e5e96e324d6cb3488528c14e4a7f7 (patch) | |
| tree | f3a77ed29e1cecd1f401b86384b322f1b005ef0b /init | |
| parent | 81ec44a6c69342fec1b1140c60a604027e429f69 (diff) | |
| parent | cc883afcc02e1c9c8ab64d20f0288355b857f966 (diff) | |
Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull misc ia64 bits from Tony Luck.
* tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
MAINTAINERS: update SGI & ia64 Altix stuff
sysctl: Enable IA64 "ignore-unaligned-usertrap" to be used cross-arch
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 335a1f680c91..28c5b9dcc91e 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1229,6 +1229,13 @@ config SYSCTL_EXCEPTION_TRACE | |||
| 1229 | help | 1229 | help |
| 1230 | Enable support for /proc/sys/debug/exception-trace. | 1230 | Enable support for /proc/sys/debug/exception-trace. |
| 1231 | 1231 | ||
| 1232 | config SYSCTL_ARCH_UNALIGN_NO_WARN | ||
| 1233 | bool | ||
| 1234 | help | ||
| 1235 | Enable support for /proc/sys/kernel/ignore-unaligned-usertrap | ||
| 1236 | Allows arch to define/use @no_unaligned_warning to possibly warn | ||
| 1237 | about unaligned access emulation going on under the hood. | ||
| 1238 | |||
| 1232 | config KALLSYMS | 1239 | config KALLSYMS |
| 1233 | bool "Load all symbols for debugging/ksymoops" if EXPERT | 1240 | bool "Load all symbols for debugging/ksymoops" if EXPERT |
| 1234 | default y | 1241 | default y |