diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-03 12:16:03 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-03 12:16:03 -0500 |
| commit | 801c63c38ae52e8bfb3f6518de00a0be22c55f9a (patch) | |
| tree | bb7b9539f2f2b8077a04c2df3b60ac8cc8fa692d /kernel/sysctl.c | |
| parent | 1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299 (diff) | |
| parent | 348edc59a8f9b9a66700781d972c24a46a79ae86 (diff) | |
Merge branch 'upstream'
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; extern int acct_parm[]; #endif +#ifdef CONFIG_IA64 +extern int no_unaligned_warning; +#endif + static int parse_table(int __user *, int, void __user *, size_t __user *, void __user *, size_t, ctl_table *, void **); static int proc_doutsstring(ctl_table *table, int write, struct file *filp, @@ -666,6 +670,16 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, #endif +#ifdef CONFIG_IA64 + { + .ctl_name = KERN_IA64_UNALIGNED, + .procname = "ignore-unaligned-usertrap", + .data = &no_unaligned_warning, + .maxlen = sizeof (int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, +#endif { .ctl_name = 0 } }; |