diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-25 15:54:14 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-25 15:54:14 +0300 |
| commit | cc37d3d20604f3759d269247b022616f710aa52d (patch) | |
| tree | 72758a50bb9352b992842e9a8f9901aa6193b71d /include/linux | |
| parent | b594deb0cc54d857828d2e33b2e9d5a9f02f0e89 (diff) | |
| parent | b56863630ddbdea6e22df8835f78f0b1da037103 (diff) | |
| download | linux-cc37d3d20604f3759d269247b022616f710aa52d.tar.xz | |
Merge branch 'core/futexes' into core/core
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/futex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/futex.h b/include/linux/futex.h index 8f627b9ae2b1..3bf5bb5a34f9 100644 --- a/include/linux/futex.h +++ b/include/linux/futex.h @@ -25,7 +25,8 @@ union ktime; #define FUTEX_WAKE_BITSET 10 #define FUTEX_PRIVATE_FLAG 128 -#define FUTEX_CMD_MASK ~FUTEX_PRIVATE_FLAG +#define FUTEX_CLOCK_REALTIME 256 +#define FUTEX_CMD_MASK ~(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME) #define FUTEX_WAIT_PRIVATE (FUTEX_WAIT | FUTEX_PRIVATE_FLAG) #define FUTEX_WAKE_PRIVATE (FUTEX_WAKE | FUTEX_PRIVATE_FLAG) |