On Mon, Sep 14, 2020 at 10:42:15PM +0200, Thomas Gleixner wrote:

CONFIG_PREEMPT_COUNT is now unconditionally enabled and will be removed. Cleanup the leftovers before doing so.

Signed-off-by: Thomas Gleixner tglx@linutronix.de

include/linux/bit_spinlock.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/include/linux/bit_spinlock.h +++ b/include/linux/bit_spinlock.h @@ -90,10 +90,8 @@ static inline int bit_spin_is_locked(int { #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK) return test_bit(bitnum, addr); -#elif defined CONFIG_PREEMPT_COUNT

• return preempt_count();

#else

• return 1;

• return preempt_count();

#endif

Acked-by: Will Deacon will@kernel.org

Will