diff options
| author | Vineet Gupta <Vineet.Gupta1@synopsys.com> | 2013-01-09 20:06:28 +0530 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2013-01-09 10:48:34 -0800 |
| commit | b6fca72536fb94098acb23c00b4e65d3bc4bb252 (patch) | |
| tree | 5fec671de29e4fee7a0be6aca6e93d0acbe09a0d /kernel | |
| parent | d1c3ed669a2d452cacfb48c2d171a1f364dae2ed (diff) | |
| download | linux-b6fca72536fb94098acb23c00b4e65d3bc4bb252.tar.gz linux-b6fca72536fb94098acb23c00b4e65d3bc4bb252.tar.bz2 linux-b6fca72536fb94098acb23c00b4e65d3bc4bb252.zip | |
sysctl: Enable IA64 "ignore-unaligned-usertrap" to be used cross-arch
IA64 defines /proc/sys/kernel/ignore-unaligned-usertrap to control
verbose warnings on unaligned access emulation.
Although the exact mechanics of what to do with sysctl (ignore/shout)
are arch specific, this change enables the sysctl to be usable cross-arch.
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
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 c88878db491e..840fd5eb2309 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -161,10 +161,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); @@ -911,7 +914,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, @@ -919,6 +922,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, |