diff --git a/[refs] b/[refs] index 3320a3729ce1..221c89bc6bc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c703d35fa91911dd92a18c31a718853f483ad80 +refs/heads/master: 1d4a788f15302877ff2cb08f22009e290a36a209 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index dd249c37b3a3..9c042f901570 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -394,7 +394,6 @@ void __mmdrop(struct mm_struct *mm) { BUG_ON(mm == &init_mm); mm_free_pgd(mm); - mm_free_cgroup(mm); destroy_context(mm); free_mm(mm); } @@ -416,6 +415,7 @@ void mmput(struct mm_struct *mm) spin_unlock(&mmlist_lock); } put_swap_token(mm); + mm_free_cgroup(mm); mmdrop(mm); } }