diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 17:55:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 17:55:48 -0800 |
| commit | 27ea6dfdc23e5e96e324d6cb3488528c14e4a7f7 (patch) | |
| tree | f3a77ed29e1cecd1f401b86384b322f1b005ef0b /arch/ia64 | |
| parent | 81ec44a6c69342fec1b1140c60a604027e429f69 (diff) | |
| parent | cc883afcc02e1c9c8ab64d20f0288355b857f966 (diff) | |
| download | linux-3.10-27ea6dfdc23e5e96e324d6cb3488528c14e4a7f7.tar.gz linux-3.10-27ea6dfdc23e5e96e324d6cb3488528c14e4a7f7.tar.bz2 linux-3.10-27ea6dfdc23e5e96e324d6cb3488528c14e4a7f7.zip | |
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 'arch/ia64')
| -rw-r--r-- | arch/ia64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index c1b80fb6938..c90366ef718 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -39,6 +39,7 @@ config IA64 select ARCH_THREAD_INFO_ALLOCATOR select ARCH_CLOCKSOURCE_DATA select GENERIC_TIME_VSYSCALL_OLD + select SYSCTL_ARCH_UNALIGN_NO_WARN select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_RELA default y |