diff options
| author | David Rientjes <rientjes@google.com> | 2015-09-08 15:00:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 15:35:28 -0700 |
| commit | 071a4befebb655d6b31bf5c6bacd5a6df035224d (patch) | |
| tree | b57c135e68a40d48a51f2b1b126179a7121b23f6 /Documentation/sysrq.txt | |
| parent | 54e9e29132d7caefcad470281cae06ac34a982c8 (diff) | |
| download | linux-next-071a4befebb655d6b31bf5c6bacd5a6df035224d.tar.gz | |
mm, oom: do not panic for oom kills triggered from sysrq
Sysrq+f is used to kill a process either for debug or when the VM is
otherwise unresponsive.
It is not intended to trigger a panic when no process may be killed.
Avoid panicking the system for sysrq+f when no processes are killed.
Signed-off-by: David Rientjes <rientjes@google.com>
Suggested-by: Michal Hocko <mhocko@suse.cz>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/sysrq.txt')
| -rw-r--r-- | Documentation/sysrq.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt index 267f39386f99..13f5619b2203 100644 --- a/Documentation/sysrq.txt +++ b/Documentation/sysrq.txt @@ -75,7 +75,8 @@ On all - write a character to /proc/sysrq-trigger. 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) |