|
@@ -607,6 +607,9 @@ void check_panic_on_oom(struct oom_control *oc, enum oom_constraint constraint,
|
|
|
if (constraint != CONSTRAINT_NONE)
|
|
|
return;
|
|
|
}
|
|
|
+ /* Do not panic for oom kills triggered by sysrq */
|
|
|
+ if (oc->order == -1)
|
|
|
+ return;
|
|
|
dump_header(oc, NULL, memcg);
|
|
|
panic("Out of memory: %s panic_on_oom is enabled\n",
|
|
|
sysctl_panic_on_oom == 2 ? "compulsory" : "system-wide");
|
|
@@ -686,11 +689,11 @@ bool out_of_memory(struct oom_control *oc)
|
|
|
|
|
|
p = select_bad_process(oc, &points, totalpages);
|
|
|
/* Found nothing?!?! Either we hang forever, or we panic. */
|
|
|
- if (!p) {
|
|
|
+ if (!p && oc->order != -1) {
|
|
|
dump_header(oc, NULL, NULL);
|
|
|
panic("Out of memory and no killable processes...\n");
|
|
|
}
|
|
|
- if (p != (void *)-1UL) {
|
|
|
+ if (p && p != (void *)-1UL) {
|
|
|
oom_kill_process(oc, p, points, totalpages, NULL,
|
|
|
"Out of memory");
|
|
|
killed = 1;
|