Code Review
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Make futex_wait() use an hrtimer for timeout
[linux-2.6.git]
/
include
/
linux
/
futex.h
diff --git
a/include/linux/futex.h
b/include/linux/futex.h
index 820125c628c1364478cfcc513275214aa9da628a..34e54f2b8997b322825f41232225cb1dad60c80b 100644
(file)
--- a/
include/linux/futex.h
+++ b/
include/linux/futex.h
@@
-3,6
+3,8
@@
#include <linux/sched.h>
#include <linux/sched.h>
+union ktime;
+
/* Second argument to futex syscall */
/* Second argument to futex syscall */
@@
-94,7
+96,7
@@
struct robust_list_head {
#define ROBUST_LIST_LIMIT 2048
#ifdef __KERNEL__
#define ROBUST_LIST_LIMIT 2048
#ifdef __KERNEL__
-long do_futex(u32 __user *uaddr, int op, u32 val, un
signed long
timeout,
+long do_futex(u32 __user *uaddr, int op, u32 val, un
ion ktime *
timeout,
u32 __user *uaddr2, u32 val2, u32 val3);
extern int
u32 __user *uaddr2, u32 val2, u32 val3);
extern int