lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] oom_kill_task(): cleanup ->mm checks

Browse Source 
- It is not possible to have task->mm == &init_mm.

- task_lock() buys nothing for 'if (!p->mm)' check.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Oleg Nesterov
2006-09-29 02:01:13 -07:00
committed by Linus Torvalds
parent 972c4ea59c
commit 01017a2270
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mm/oom_kill.c
View File

@@ -260,14 +260,11 @@ static void __oom_kill_task(struct task_struct *p, const char *message)
return; return;
} }
task_lock(p); if (!p->mm) {
if (!p->mm || p->mm == &init_mm) {
WARN_ON(1); WARN_ON(1);
printk(KERN_WARNING "tried to kill an mm-less task!\n"); printk(KERN_WARNING "tried to kill an mm-less task!\n");
task_unlock(p);
return; return;
} }
task_unlock(p);
if (message) { if (message) {
printk(KERN_ERR "%s: Killed process %d (%s).\n", printk(KERN_ERR "%s: Killed process %d (%s).\n",
@@ -301,7 +298,7 @@ static int oom_kill_task(struct task_struct *p, const char *message)
* However, this is of no concern to us. * However, this is of no concern to us.
*/ */
if (mm == NULL || mm == &init_mm) if (mm == NULL)
return 1; return 1;
__oom_kill_task(p, message); __oom_kill_task(p, message);