---

yaml --- r: 156034 b: refs/heads/master c: 933b787 h: refs/heads/master v: v3
git-mirror · Jul 30, 2009 · 50aafe6 · 50aafe6
1 parent 4e5e0b8
commit 50aafe6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);