diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 12:40:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 12:40:44 -0700 |
| commit | ccbfddb78c7bfdce442589ccce6d60f133251b9d (patch) | |
| tree | 6bc112148a1747ea922b783e61da8a77a926aac9 /drivers | |
| parent | 8d2b6b3ae280dcf6f6c7a95623670a57cdf562ed (diff) | |
| parent | e793d8c6740f8fe704fa216e95685f4d92c4c4b9 (diff) | |
| download | linux-ccbfddb78c7bfdce442589ccce6d60f133251b9d.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Two sparc64 perf bug fixes and add a sysrq facility so I can diagnose
these kinds of problems more quickly in the future."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix bit twiddling in sparc_pmu_enable_event().
sparc64: Add global PMU register dumping via sysrq.
sparc64: Like x86 we should check current->mm during perf backtrace generation.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/sysrq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 05728894a88c..16ee6cee07da 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -452,6 +452,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { NULL, /* v */ &sysrq_showstate_blocked_op, /* w */ /* x: May be registered on ppc/powerpc for xmon */ + /* x: May be registered on sparc64 for global PMU dump */ NULL, /* x */ /* y: May be registered on sparc64 for global register dump */ NULL, /* y */ |