diff options
author | 2010-03-04 11:51:29 +0100 | |
---|---|---|
committer | 2010-03-04 11:51:29 +0100 | |
commit | e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 (patch) | |
tree | 61b64506b2c016e050f940a89d1ffd36b7c00fdf /kernel/sysctl.c | |
parent | tracing: Include irqflags headers from trace clock (diff) | |
parent | tracing: Fix warning in s_next of trace file ops (diff) | |
download | linux-dev-e02c4fd3142dfb9412531bbfabd510a2a7c6ea46.tar.xz linux-dev-e02c4fd3142dfb9412531bbfabd510a2a7c6ea46.zip |
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[] = { }; static struct ctl_table debug_table[] = { -#if defined(CONFIG_X86) || defined(CONFIG_PPC) +#if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) { .procname = "exception-trace", .data = &show_unhandled_signals, |