diff options
| author | Clark Williams <williams@redhat.com> | 2012-04-04 10:52:26 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-04 10:52:26 -0500 |
| commit | 2d93eaf2d4ace5853a74a4b0596f601aa62cb840 (patch) | |
| tree | b0a2e2083c1749c4e3b8ae23db7bb13a7ca9aafe /kernel/futex.c | |
| parent | 003133585fc61d7bd36d3a097d7fde62e64a9550 (diff) | |
| parent | 23d8c3f8f494c8516c9b4c05529e118e6a485956 (diff) | |
Merge commit 'v3.2.14' into rt-3.2.14-rt23v3.2.14-rt23
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 2d311cdad5a6..97e3f0f16553 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2687,6 +2687,16 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, } switch (cmd) { + case FUTEX_LOCK_PI: + case FUTEX_UNLOCK_PI: + case FUTEX_TRYLOCK_PI: + case FUTEX_WAIT_REQUEUE_PI: + case FUTEX_CMP_REQUEUE_PI: + if (!futex_cmpxchg_enabled) + return -ENOSYS; + } + + switch (cmd) { case FUTEX_WAIT: val3 = FUTEX_BITSET_MATCH_ANY; case FUTEX_WAIT_BITSET: @@ -2707,16 +2717,13 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, ret = futex_wake_op(uaddr, flags, uaddr2, val, val2, val3); break; case FUTEX_LOCK_PI: - if (futex_cmpxchg_enabled) - ret = futex_lock_pi(uaddr, flags, val, timeout, 0); + ret = futex_lock_pi(uaddr, flags, val, timeout, 0); break; case FUTEX_UNLOCK_PI: - if (futex_cmpxchg_enabled) - ret = futex_unlock_pi(uaddr, flags); + ret = futex_unlock_pi(uaddr, flags); break; case FUTEX_TRYLOCK_PI: - if (futex_cmpxchg_enabled) - ret = futex_lock_pi(uaddr, flags, 0, timeout, 1); + ret = futex_lock_pi(uaddr, flags, 0, timeout, 1); break; case FUTEX_WAIT_REQUEUE_PI: val3 = FUTEX_BITSET_MATCH_ANY; |