diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-04 05:51:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-04 05:51:29 -0500 |
| commit | e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 (patch) | |
| tree | 61b64506b2c016e050f940a89d1ffd36b7c00fdf /kernel/sysctl.c | |
| parent | ae1f30384baef4056438d81b305a6a5199b0d16c (diff) | |
| parent | ac91d85456372a90af5b85eb6620fd2efb1e431b (diff) | |
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 8a68b2448468..33e7a38b6eb9 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -1441,7 +1441,7 @@ static struct ctl_table fs_table[] = { | |||
| 1441 | }; | 1441 | }; |
| 1442 | 1442 | ||
| 1443 | static struct ctl_table debug_table[] = { | 1443 | static struct ctl_table debug_table[] = { |
| 1444 | #if defined(CONFIG_X86) || defined(CONFIG_PPC) | 1444 | #if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) |
| 1445 | { | 1445 | { |
| 1446 | .procname = "exception-trace", | 1446 | .procname = "exception-trace", |
| 1447 | .data = &show_unhandled_signals, | 1447 | .data = &show_unhandled_signals, |