Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01017a22 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

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



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

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

Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 972c4ea5

mm/oom_kill.c

+2 −5
Original line number Diff line number Diff line
@@ -260,14 +260,11 @@ static void __oom_kill_task(struct task_struct *p, const char *message) 
		return;

	}



	task_lock(p);

	if (!p->mm || p->mm == &init_mm) {

	if (!p->mm) {

		WARN_ON(1);

		printk(KERN_WARNING "tried to kill an mm-less task!\n");

		task_unlock(p);

		return;

	}

	task_unlock(p);



	if (message) {

		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.

	 */



	if (mm == NULL || mm == &init_mm)

	if (mm == NULL)

		return 1;



	__oom_kill_task(p, message);