---

yaml --- r: 74650 b: refs/heads/master c: cde898f h: refs/heads/master v: v3
git-mirror · Dec 5, 2007 · eae51dd · eae51dd
1 parent 4a75418
commit eae51dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54561783ee99d73a086f3abbda3e44f87f6bf65b
+refs/heads/master: cde898fa80a45bb23eab2a060fc79d0913081409
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
@@ -658,7 +658,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
 
 		if (curval == -EFAULT)
 			ret = -EFAULT;
-		if (curval != uval)
+		else if (curval != uval)
 			ret = -EINVAL;
 		if (ret) {
 			spin_unlock(&pi_state->pi_mutex.wait_lock);