Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24503
b: refs/heads/master
c: ec7e15d
h: refs/heads/master
i:
  24501: c23d19f
  24499: 5552297
  24495: 5fa4122
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Mar 28, 2006
1 parent ad5ca9c commit 40da974
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: 4fa95ef639830ccf0ca1ad42ee9bed87ef642f32
refs/heads/master: ec7e15d6486e9d1da1c2f344b670b8388ba7019b
3 changes: 2 additions & 1 deletion trunk/kernel/futex_compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,5 +137,6 @@ asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val,
if (op >= FUTEX_REQUEUE)
val2 = (int) (unsigned long) utime;

return do_futex(uaddr, op, val, timeout, uaddr2, val2, val3);
return do_futex((unsigned long)uaddr, op, val, timeout,
(unsigned long)uaddr2, val2, val3);
}

0 comments on commit 40da974

Please sign in to comment.