From 4b8364f9390ef4ee80908b5b516d10e5de13ccfd Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 5 Oct 2009 18:18:03 +0200
Subject: [PATCH] --- yaml --- r: 167115 b: refs/heads/master c:
 322a2c100a8998158445599ea437fb556aa95b11 h: refs/heads/master i:   167113:
 9d872e6d6c1ceb2b02908cbfb30618bc067e73bd   167111:
 dbf751a770fe4a070443d40eeabff4eed27b7343 v: v3

---
 [refs]              | 2 +-
 trunk/kernel/exit.c | 2 --
 trunk/kernel/fork.c | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 58149e14a3c3..304f3ec4d6fb 100644
--- 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
index ae5d8660ddff..bc2b1fdfc354 100644
--- 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
index 88ef51ca84de..341965b0ab1c 100644
--- 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 */