These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / Documentation / sysrq.txt

diff --git a/kernel/Documentation/sysrq.txt b/kernel/Documentation/sysrq.txt
index 6964d0f..f64d075 100644 (file)
--- a/kernel/Documentation/sysrq.txt
+++ b/kernel/Documentation/sysrq.txt
@@ -82,7 +82,8 @@ On all - Enable network SysRq by writing a cookie to icmp_echo_sysrq, e.g.
 
 'e'     - Send a SIGTERM to all processes, except for init.
 
-'f'    - Will call oom_kill to kill a memory hog process.
+'f'    - Will call the oom killer to kill a memory hog process, but do not
+         panic if nothing can be killed.
 
 'g'    - Used by kgdb (kernel debugger)
 
@@ -126,6 +127,7 @@ On all - Enable network SysRq by writing a cookie to icmp_echo_sysrq, e.g.
 
 'x'    - Used by xmon interface on ppc/powerpc platforms.
           Show global PMU Registers on sparc64.
+          Dump all TLB entries on MIPS.
 
 'y'    - Show global CPU Registers [SPARC-64 specific]