Commit 27ea6dfdc23e5e96e324d6cb3488528c14e4a7f7
Exists in
master
and in
20 other branches
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
Showing 4 changed files Side-by-side Diff
MAINTAINERS
| ... | ... | @@ -6841,7 +6841,8 @@ |
| 6841 | 6841 | F: drivers/net/ethernet/sfc/ |
| 6842 | 6842 | |
| 6843 | 6843 | SGI GRU DRIVER |
| 6844 | -M: Jack Steiner <steiner@sgi.com> | |
| 6844 | +M: Dimitri Sivanich <sivanich@sgi.com> | |
| 6845 | +M: Robin Holt <holt@sgi.com> | |
| 6845 | 6846 | S: Maintained |
| 6846 | 6847 | F: drivers/misc/sgi-gru/ |
| 6847 | 6848 | |
| ... | ... | @@ -7035,14 +7036,6 @@ |
| 7035 | 7036 | L: linux-fbdev@vger.kernel.org |
| 7036 | 7037 | S: Maintained |
| 7037 | 7038 | F: drivers/video/smscufx.c |
| 7038 | - | |
| 7039 | -SN-IA64 (Itanium) SUB-PLATFORM | |
| 7040 | -M: Jes Sorensen <jes@sgi.com> | |
| 7041 | -L: linux-altix@sgi.com | |
| 7042 | -L: linux-ia64@vger.kernel.org | |
| 7043 | -W: http://www.sgi.com/altix | |
| 7044 | -S: Maintained | |
| 7045 | -F: arch/ia64/sn/ | |
| 7046 | 7039 | |
| 7047 | 7040 | SOC-CAMERA V4L2 SUBSYSTEM |
| 7048 | 7041 | M: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
arch/ia64/Kconfig
init/Kconfig
| ... | ... | @@ -1229,6 +1229,13 @@ |
| 1229 | 1229 | help |
| 1230 | 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 | 1239 | config KALLSYMS |
| 1233 | 1240 | bool "Load all symbols for debugging/ksymoops" if EXPERT |
| 1234 | 1241 | default y |
kernel/sysctl.c
| ... | ... | @@ -162,10 +162,13 @@ |
| 162 | 162 | #endif |
| 163 | 163 | |
| 164 | 164 | #ifdef CONFIG_IA64 |
| 165 | -extern int no_unaligned_warning; | |
| 166 | 165 | extern int unaligned_dump_stack; |
| 167 | 166 | #endif |
| 168 | 167 | |
| 168 | +#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN | |
| 169 | +extern int no_unaligned_warning; | |
| 170 | +#endif | |
| 171 | + | |
| 169 | 172 | #ifdef CONFIG_PROC_SYSCTL |
| 170 | 173 | static int proc_do_cad_pid(struct ctl_table *table, int write, |
| 171 | 174 | void __user *buffer, size_t *lenp, loff_t *ppos); |
| ... | ... | @@ -919,7 +922,7 @@ |
| 919 | 922 | .proc_handler = proc_doulongvec_minmax, |
| 920 | 923 | }, |
| 921 | 924 | #endif |
| 922 | -#ifdef CONFIG_IA64 | |
| 925 | +#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN | |
| 923 | 926 | { |
| 924 | 927 | .procname = "ignore-unaligned-usertrap", |
| 925 | 928 | .data = &no_unaligned_warning, |
| ... | ... | @@ -927,6 +930,8 @@ |
| 927 | 930 | .mode = 0644, |
| 928 | 931 | .proc_handler = proc_dointvec, |
| 929 | 932 | }, |
| 933 | +#endif | |
| 934 | +#ifdef CONFIG_IA64 | |
| 930 | 935 | { |
| 931 | 936 | .procname = "unaligned-dump-stack", |
| 932 | 937 | .data = &unaligned_dump_stack, |