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 /kernel | |
| 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 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 4fc9be955c71..467d8b923fcd 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -162,10 +162,13 @@ extern int unaligned_enabled; #endif #ifdef CONFIG_IA64 -extern int no_unaligned_warning; extern int unaligned_dump_stack; #endif +#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN +extern int no_unaligned_warning; +#endif + #ifdef CONFIG_PROC_SYSCTL static int proc_do_cad_pid(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); @@ -919,7 +922,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_doulongvec_minmax, }, #endif -#ifdef CONFIG_IA64 +#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN { .procname = "ignore-unaligned-usertrap", .data = &no_unaligned_warning, @@ -927,6 +930,8 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, +#endif +#ifdef CONFIG_IA64 { .procname = "unaligned-dump-stack", .data = &unaligned_dump_stack, |