diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c05a2b7125e1..acf6c1550f27 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -124,6 +124,10 @@ extern int sysctl_hz_timer; | |||
124 | extern int acct_parm[]; | 124 | extern int acct_parm[]; |
125 | #endif | 125 | #endif |
126 | 126 | ||
127 | #ifdef CONFIG_IA64 | ||
128 | extern int no_unaligned_warning; | ||
129 | #endif | ||
130 | |||
127 | static int parse_table(int __user *, int, void __user *, size_t __user *, void __user *, size_t, | 131 | static int parse_table(int __user *, int, void __user *, size_t __user *, void __user *, size_t, |
128 | ctl_table *, void **); | 132 | ctl_table *, void **); |
129 | static int proc_doutsstring(ctl_table *table, int write, struct file *filp, | 133 | static int proc_doutsstring(ctl_table *table, int write, struct file *filp, |
@@ -666,6 +670,16 @@ static ctl_table kern_table[] = { | |||
666 | .proc_handler = &proc_dointvec, | 670 | .proc_handler = &proc_dointvec, |
667 | }, | 671 | }, |
668 | #endif | 672 | #endif |
673 | #ifdef CONFIG_IA64 | ||
674 | { | ||
675 | .ctl_name = KERN_IA64_UNALIGNED, | ||
676 | .procname = "ignore-unaligned-usertrap", | ||
677 | .data = &no_unaligned_warning, | ||
678 | .maxlen = sizeof (int), | ||
679 | .mode = 0644, | ||
680 | .proc_handler = &proc_dointvec, | ||
681 | }, | ||
682 | #endif | ||
669 | { .ctl_name = 0 } | 683 | { .ctl_name = 0 } |
670 | }; | 684 | }; |
671 | 685 | ||