mm: copy over oom_adj value at fork time

Fix a post-2.6.31 regression which was introduced by 2ff05b2 ("oom: move oom_adj value from task_struct to mm_struct"). After moving the oom_adj value from the task struct to the mm_struct, the oom_adj value was no longer properly inherited by child processes. Copying over the oom_adj value at fork time fixes that bug. [[email protected]: test for current->mm before dereferencing it] Signed-off-by: Rik van Riel <[email protected]> Reported-by: Paul Menage <[email protected]> Cc: KOSAKI Motohiro <[email protected]> Acked-by: David Rientjes <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
RyanHsu · Jul 30, 2009 · 933b787 · 933b787
1 parent 6583bb6
commit 933b787
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/kernel/fork.c b/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);