From 67bf0a6dee77ceb0abe267c4f020157de47523cc Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Wed, 7 Oct 2009 11:13:58 +1100 Subject: [PATCH] --- yaml --- r: 167119 b: refs/heads/master c: f8d1e548931cfa5ea9a082e020c2a47d27e5d793 h: refs/heads/master i: 167117: 142b15873185dfbb0fcb7857dc8b948e3957caa1 167115: 4b8364f9390ef4ee80908b5b516d10e5de13ccfd 167111: dbf751a770fe4a070443d40eeabff4eed27b7343 167103: b8a11ab1bcad73af236b69022602ebdd18c37f95 v: v3 --- [refs] | 2 +- trunk/include/linux/futex.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 95d75ca04038..7cae4230cefa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 978c0b88146a7f9b364b71b5b83c5b12e7b413d7 +refs/heads/master: f8d1e548931cfa5ea9a082e020c2a47d27e5d793 diff --git a/trunk/include/linux/futex.h b/trunk/include/linux/futex.h index 34956c8fdebf..78b92ec9edbd 100644 --- a/trunk/include/linux/futex.h +++ b/trunk/include/linux/futex.h @@ -38,8 +38,8 @@ union ktime; #define FUTEX_LOCK_PI_PRIVATE (FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG) #define FUTEX_UNLOCK_PI_PRIVATE (FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG) #define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG) -#define FUTEX_WAIT_BITSET_PRIVATE (FUTEX_WAIT_BITS | FUTEX_PRIVATE_FLAG) -#define FUTEX_WAKE_BITSET_PRIVATE (FUTEX_WAKE_BITS | FUTEX_PRIVATE_FLAG) +#define FUTEX_WAIT_BITSET_PRIVATE (FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG) +#define FUTEX_WAKE_BITSET_PRIVATE (FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG) #define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | \ FUTEX_PRIVATE_FLAG) #define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | \