Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e37837fb authored Apr 18, 2016 by Peter Zijlstra Committed by Ingo Molnar Jun 16, 2016

locking/atomic: 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>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arch@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent b53d6bed

include/linux/atomic.h

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -480,16 +480,6 @@ static inline int atomic_fetch_andnot_release(int i, atomic_t *v)
	}		}
	#endif		#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		* atomic_inc_not_zero_hint - increment if not null
	* @v: pointer of type atomic_t		* @v: pointer of type atomic_t

kernel/locking/qspinlock_paravirt.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -112,12 +112,12 @@ static __always_inline int trylock_clear_pending(struct qspinlock *lock)
	#else /* _Q_PENDING_BITS == 8 */		#else /* _Q_PENDING_BITS == 8 */
	static __always_inline void set_pending(struct qspinlock *lock)		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)		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)		static __always_inline int trylock_clear_pending(struct qspinlock *lock)