lkml.org 
[lkml]   [2016]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC][PATCH 28/31] locking: Remove the deprecated atomic_{set,clear}_mask() functions
    These functions have been deprecated for a while and there is only the
    one user left, convert and kill.

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    ---
    include/linux/atomic.h | 10 ----------
    kernel/locking/qspinlock_paravirt.h | 4 ++--
    2 files changed, 2 insertions(+), 12 deletions(-)

    --- a/include/linux/atomic.h
    +++ b/include/linux/atomic.h
    @@ -480,16 +480,6 @@ static inline int atomic_fetch_andnot_re
    }
    #endif

    -static inline __deprecated void atomic_clear_mask(unsigned int mask, atomic_t *v)
    -{
    - atomic_andnot(mask, v);
    -}
    -
    -static inline __deprecated void atomic_set_mask(unsigned int mask, atomic_t *v)
    -{
    - atomic_or(mask, v);
    -}
    -
    /**
    * atomic_inc_not_zero_hint - increment if not null
    * @v: pointer of type atomic_t
    --- a/kernel/locking/qspinlock_paravirt.h
    +++ b/kernel/locking/qspinlock_paravirt.h
    @@ -112,12 +112,12 @@ static __always_inline int trylock_clear
    #else /* _Q_PENDING_BITS == 8 */
    static __always_inline void set_pending(struct qspinlock *lock)
    {
    - atomic_set_mask(_Q_PENDING_VAL, &lock->val);
    + atomic_or(_Q_PENDING_VAL, &lock->val);
    }

    static __always_inline void clear_pending(struct qspinlock *lock)
    {
    - atomic_clear_mask(_Q_PENDING_VAL, &lock->val);
    + atomic_andnot(_Q_PENDING_VAL, &lock->val);
    }

    static __always_inline int trylock_clear_pending(struct qspinlock *lock)

    \
     
     \ /
      Last update: 2016-04-22 12:01    [W:4.194 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site