path: root/Documentation
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-17 12:40:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-17 12:40:44 -0700
commitccbfddb78c7bfdce442589ccce6d60f133251b9d (patch)
tree6bc112148a1747ea922b783e61da8a77a926aac9 /Documentation
parent8d2b6b3ae280dcf6f6c7a95623670a57cdf562ed (diff)
parente793d8c6740f8fe704fa216e95685f4d92c4c4b9 (diff)
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 'Documentation')
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
index 642f84495b2..2a4cdda4828 100644
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
@@ -116,6 +116,7 @@ On all - write a character to /proc/sysrq-trigger. e.g.:
'w' - Dumps tasks that are in uninterruptable (blocked) state.
'x' - Used by xmon interface on ppc/powerpc platforms.
+ Show global PMU Registers on sparc64.
'y' - Show global CPU Registers [SPARC-64 specific]