Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 31533
b: refs/heads/master
c: ed6f7b1
h: refs/heads/master
i:
  31531: 826ec79
v: v3
  • Loading branch information
Ingo Molnar authored and Linus Torvalds committed Jul 1, 2006
1 parent f1ca6a6 commit 846ccaf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a99e4e413e1ab9f3c567b5519f5557afd786dc62
refs/heads/master: ed6f7b10e657b98b4ba89385d02852c8bdf3980e
6 changes: 4 additions & 2 deletions trunk/kernel/futex.c
Original file line number Diff line number Diff line change
Expand Up @@ -630,8 +630,10 @@ static int futex_wake(u32 __user *uaddr, int nr_wake)

list_for_each_entry_safe(this, next, head, list) {
if (match_futex (&this->key, &key)) {
if (this->pi_state)
return -EINVAL;
if (this->pi_state) {
ret = -EINVAL;
break;
}
wake_futex(this);
if (++ret >= nr_wake)
break;
Expand Down

0 comments on commit 846ccaf

Please sign in to comment.