diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 21:40:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 21:40:44 +0200 |
| commit | ccbfddb78c7bfdce442589ccce6d60f133251b9d (patch) | |
| tree | 6bc112148a1747ea922b783e61da8a77a926aac9 /Documentation | |
| parent | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (diff) | |
| parent | sparc64: Fix bit twiddling in sparc_pmu_enable_event(). (diff) | |
| download | linux-ccbfddb78c7bfdce442589ccce6d60f133251b9d.tar.xz linux-ccbfddb78c7bfdce442589ccce6d60f133251b9d.zip | |
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')
| -rw-r--r-- | Documentation/sysrq.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt index 642f84495b29..2a4cdda4828e 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] |