diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-02 10:56:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-02 10:56:44 -0500 |
| commit | b7f3a209e9b09b3110ea084836c75f2cd26b29f2 (patch) | |
| tree | b5f77cb3f2eab58a2a2f3705fdd08bd39ea02a3f /kernel | |
| parent | 6d6b89bd2e316b78d668f761d380837b81fa71ef (diff) | |
| parent | 4b17764737bb4ee3364b8bfa2059f51ebc19ccd6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
sparc: Support show_unhandled_signals.
sparc: use __ratelimit
sunxvr500: Additional PCI id for sunxvr500 driver
sparc: use asm-generic/scatterlist.h
sparc64: If 'slot-names' property exist, create sysfs PCI slot information.
sparc: remove trailing space in messages
sparc: remove redundant return statements
Diffstat (limited to 'kernel')
| -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, |