From 7d12aa717fb6438c675b796b761b6490e7812413 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Mon, 25 Sep 2006 23:31:32 -0700
Subject: [PATCH] --- yaml --- r: 35606 b: refs/heads/master c:
 5081dde33f7a61d28d9b185cc386f12cb837c7a4 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6975a1909e59..b297e8f5d482 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af5b912435de32fbede08cee949429823ed49781
+refs/heads/master: 5081dde33f7a61d28d9b185cc386f12cb837c7a4
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index f1aba7e7b760..12cd4735dc29 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -207,6 +207,9 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
 		unsigned long points;
 		int releasing;
 
+		/* skip kernel threads */
+		if (!p->mm)
+			continue;
 		/* skip the init task with pid == 1 */
 		if (p->pid == 1)
 			continue;