From 50aafe6935e353236c5351eceec7b5a80459eaa2 Mon Sep 17 00:00:00 2001
From: Rik van Riel <riel@redhat.com>
Date: Wed, 29 Jul 2009 15:02:07 -0700
Subject: [PATCH] --- yaml --- r: 156034 b: refs/heads/master c:
 933b787b57ca8bdc0fc8fb2cbf67b5e6d21beb84 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/kernel/fork.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9867144a19cd..889c8f523cf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6583bb64fc370842b32a87c67750c26f6d559af0
+refs/heads/master: 933b787b57ca8bdc0fc8fb2cbf67b5e6d21beb84
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 9b42695f0d14..29b532e718f7 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -426,6 +426,7 @@ static struct mm_struct * mm_init(struct mm_struct * mm, struct task_struct *p)
 	init_rwsem(&mm->mmap_sem);
 	INIT_LIST_HEAD(&mm->mmlist);
 	mm->flags = (current->mm) ? current->mm->flags : default_dump_filter;
+	mm->oom_adj = (current->mm) ? current->mm->oom_adj : 0;
 	mm->core_state = NULL;
 	mm->nr_ptes = 0;
 	set_mm_counter(mm, file_rss, 0);