diff --git a/[refs] b/[refs]
index 7e70abd04572..2b95ccf1944e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a570ab6f10462b062c28188b64377b8034235761
+refs/heads/master: 179c85ea53bef807621f335767e41e23f86f01df
diff --git a/trunk/kernel/futex_compat.c b/trunk/kernel/futex_compat.c
index f7921360efad..7e52eb051f22 100644
--- a/trunk/kernel/futex_compat.c
+++ b/trunk/kernel/futex_compat.c
@@ -61,10 +61,10 @@ void compat_exit_robust_list(struct task_struct *curr)
 	if (fetch_robust_entry(&upending, &pending,
 			       &head->list_op_pending, &pip))
 		return;
-	if (upending)
+	if (pending)
 		handle_futex_death((void __user *)pending + futex_offset, curr, pip);
 
-	while (compat_ptr(uentry) != &head->list) {
+	while (entry != (struct robust_list __user *) &head->list) {
 		/*
 		 * A pending lock might already be on the list, so
 		 * dont process it twice: