projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SSB]: add Sonics Silicon Backplane bus support
[cascardo/linux.git]
/
include
/
linux
/
futex.h
diff --git
a/include/linux/futex.h
b/include/linux/futex.h
index
899fc7f
..
9965035
100644
(file)
--- a/
include/linux/futex.h
+++ b/
include/linux/futex.h
@@
-17,7
+17,6
@@
union ktime;
#define FUTEX_LOCK_PI 6
#define FUTEX_UNLOCK_PI 7
#define FUTEX_TRYLOCK_PI 8
#define FUTEX_LOCK_PI 6
#define FUTEX_UNLOCK_PI 7
#define FUTEX_TRYLOCK_PI 8
-#define FUTEX_CMP_REQUEUE_PI 9
#define FUTEX_PRIVATE_FLAG 128
#define FUTEX_CMD_MASK ~FUTEX_PRIVATE_FLAG
#define FUTEX_PRIVATE_FLAG 128
#define FUTEX_CMD_MASK ~FUTEX_PRIVATE_FLAG
@@
-97,15
+96,10
@@
struct robust_list_head {
*/
#define FUTEX_OWNER_DIED 0x40000000
*/
#define FUTEX_OWNER_DIED 0x40000000
-/*
- * Some processes have been requeued on this PI-futex
- */
-#define FUTEX_WAITER_REQUEUED 0x20000000
-
/*
* The rest of the robust-futex field is for the TID:
*/
/*
* The rest of the robust-futex field is for the TID:
*/
-#define FUTEX_TID_MASK 0x
0
fffffff
+#define FUTEX_TID_MASK 0x
3
fffffff
/*
* This limit protects against a deliberately circular list.
/*
* This limit protects against a deliberately circular list.
@@
-139,7
+133,6
@@
handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi);
#define FUT_OFF_MMSHARED 2 /* We set bit 1 if key has a reference on mm */
union futex_key {
#define FUT_OFF_MMSHARED 2 /* We set bit 1 if key has a reference on mm */
union futex_key {
- u32 __user *uaddr;
struct {
unsigned long pgoff;
struct inode *inode;
struct {
unsigned long pgoff;
struct inode *inode;