diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-20 20:24:33 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-20 20:24:33 +0200 |
| commit | 39cf0518d89d1f0af79554457c52adb5b12fa43c (patch) | |
| tree | 3d04a6efe1e2afb6db7091af4b7033a56ae1b077 /kernel/fork.c | |
| parent | af15c1addf920d830b030e3489a482456904ca8c (diff) | |
| parent | 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f (diff) | |
| download | linux-39cf0518d89d1f0af79554457c52adb5b12fa43c.tar.bz2 | |
Merge branch 'master' into for-linus
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 021e1138556e..144326b7af50 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -426,7 +426,6 @@ 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); |