---

yaml --- r: 167115 b: refs/heads/master c: 322a2c1 h: refs/heads/master i: 167113: 9d872e6 167111: dbf751a v: v3
git-mirror · Oct 6, 2009 · 4b8364f · 4b8364f
1 parent 723e508
commit 4b8364f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc6b177dee33365ccb29fe6d2092223cf8d679f9
+refs/heads/master: 322a2c100a8998158445599ea437fb556aa95b11
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
@@ -989,8 +989,6 @@ NORET_TYPE void do_exit(long code)
 	tsk->mempolicy = NULL;
 #endif
 #ifdef CONFIG_FUTEX
-	if (unlikely(!list_empty(&tsk->pi_state_list)))
-		exit_pi_state_list(tsk);
 	if (unlikely(current->pi_state_cache))
 		kfree(current->pi_state_cache);
 #endif

diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
@@ -553,6 +553,8 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
 		tsk->compat_robust_list = NULL;
 	}
 #endif
+	if (unlikely(!list_empty(&tsk->pi_state_list)))
+		exit_pi_state_list(tsk);
 #endif
 
 	/* Get rid of any cached register state */