diff options
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r-- | mm/oom_kill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index a64decb5b13f..b1c2d0f86222 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -212,7 +212,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints) | |||
212 | if (!p->mm) | 212 | if (!p->mm) |
213 | continue; | 213 | continue; |
214 | /* skip the init task */ | 214 | /* skip the init task */ |
215 | if (is_init(p)) | 215 | if (is_global_init(p)) |
216 | continue; | 216 | continue; |
217 | 217 | ||
218 | /* | 218 | /* |
@@ -265,7 +265,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints) | |||
265 | */ | 265 | */ |
266 | static void __oom_kill_task(struct task_struct *p, int verbose) | 266 | static void __oom_kill_task(struct task_struct *p, int verbose) |
267 | { | 267 | { |
268 | if (is_init(p)) { | 268 | if (is_global_init(p)) { |
269 | WARN_ON(1); | 269 | WARN_ON(1); |
270 | printk(KERN_WARNING "tried to kill init!\n"); | 270 | printk(KERN_WARNING "tried to kill init!\n"); |
271 | return; | 271 | return; |