← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-lowlatency/precise-proposed

« back to all changes in this revision

Viewing changes to kernel/futex.c

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Luke Yelavich, Upstream Kernel Changes
  • Date: 2012-04-04 18:49:36 UTC
  • Revision ID: package-import@ubuntu.com-20120404184936-tqu735914muv4wpg
Tags: 3.2.0-22.30
[ Luke Yelavich ]

* [Config] Update configs after rebase against Ubuntu-3.2.0-22.35

[ Upstream Kernel Changes ]

* Low-latency: Rebase against Ubuntu-3.2.0-22.35

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/futex.c
2641
2641
        }
2642
2642
 
2643
2643
        switch (cmd) {
 
2644
        case FUTEX_LOCK_PI:
 
2645
        case FUTEX_UNLOCK_PI:
 
2646
        case FUTEX_TRYLOCK_PI:
 
2647
        case FUTEX_WAIT_REQUEUE_PI:
 
2648
        case FUTEX_CMP_REQUEUE_PI:
 
2649
                if (!futex_cmpxchg_enabled)
 
2650
                        return -ENOSYS;
 
2651
        }
 
2652
 
 
2653
        switch (cmd) {
2644
2654
        case FUTEX_WAIT:
2645
2655
                val3 = FUTEX_BITSET_MATCH_ANY;
2646
2656
        case FUTEX_WAIT_BITSET:
2661
2671
                ret = futex_wake_op(uaddr, flags, uaddr2, val, val2, val3);
2662
2672
                break;
2663
2673
        case FUTEX_LOCK_PI:
2664
 
                if (futex_cmpxchg_enabled)
2665
 
                        ret = futex_lock_pi(uaddr, flags, val, timeout, 0);
 
2674
                ret = futex_lock_pi(uaddr, flags, val, timeout, 0);
2666
2675
                break;
2667
2676
        case FUTEX_UNLOCK_PI:
2668
 
                if (futex_cmpxchg_enabled)
2669
 
                        ret = futex_unlock_pi(uaddr, flags);
 
2677
                ret = futex_unlock_pi(uaddr, flags);
2670
2678
                break;
2671
2679
        case FUTEX_TRYLOCK_PI:
2672
 
                if (futex_cmpxchg_enabled)
2673
 
                        ret = futex_lock_pi(uaddr, flags, 0, timeout, 1);
 
2680
                ret = futex_lock_pi(uaddr, flags, 0, timeout, 1);
2674
2681
                break;
2675
2682
        case FUTEX_WAIT_REQUEUE_PI:
2676
2683
                val3 = FUTEX_BITSET_MATCH_ANY;