From 723e50868ad80fa210b8d6592dbc0283cc065d19 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Mon, 5 Oct 2009 18:17:32 +0200
Subject: [PATCH] --- yaml --- r: 167114 b: refs/heads/master c:
 fc6b177dee33365ccb29fe6d2092223cf8d679f9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0da06186f17a..58149e14a3c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eaaea8036d0261d87d7072c5bc88c7ea730c18ac
+refs/heads/master: fc6b177dee33365ccb29fe6d2092223cf8d679f9
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index bfee931ee3fb..88ef51ca84de 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -543,11 +543,15 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
 
 	/* Get rid of any futexes when releasing the mm */
 #ifdef CONFIG_FUTEX
-	if (unlikely(tsk->robust_list))
+	if (unlikely(tsk->robust_list)) {
 		exit_robust_list(tsk);
+		tsk->robust_list = NULL;
+	}
 #ifdef CONFIG_COMPAT
-	if (unlikely(tsk->compat_robust_list))
+	if (unlikely(tsk->compat_robust_list)) {
 		compat_exit_robust_list(tsk);
+		tsk->compat_robust_list = NULL;
+	}
 #endif
 #endif