diff options
Diffstat (limited to 'mm/oom_kill.c')
| -rw-r--r-- | mm/oom_kill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 9595a0f6c4b8..4bbb1cb10495 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
| @@ -145,7 +145,7 @@ static struct task_struct * select_bad_process(void) | |||
| 145 | do_posix_clock_monotonic_gettime(&uptime); | 145 | do_posix_clock_monotonic_gettime(&uptime); |
| 146 | do_each_thread(g, p) | 146 | do_each_thread(g, p) |
| 147 | /* skip the init task with pid == 1 */ | 147 | /* skip the init task with pid == 1 */ |
| 148 | if (p->pid > 1) { | 148 | if (p->pid > 1 && p->oomkilladj != OOM_DISABLE) { |
| 149 | unsigned long points; | 149 | unsigned long points; |
| 150 | 150 | ||
| 151 | /* | 151 | /* |