[tip:,core/rcu] locking/bitspinlock: Cleanup PREEMPT_COUNT leftovers
diff mbox series

Message ID 160226288653.7002.2578979062422193705.tip-bot2@tip-bot2
State In Next
Commit c2743d1a8f70d161fa22015e15d6060b0e51dbe6
Headers show
Series
  • [tip:,core/rcu] locking/bitspinlock: Cleanup PREEMPT_COUNT leftovers
Related show

Commit Message

tip-bot2 for Juergen Gross Oct. 9, 2020, 5:01 p.m. UTC 
The following commit has been merged into the core/rcu branch of tip:

Commit-ID:     cce05b43263a1b12b7c0a8b003d6c2295e17f580
Gitweb:        https://git.kernel.org/tip/cce05b43263a1b12b7c0a8b003d6c2295e17f580
Author:        Thomas Gleixner <tglx@linutronix.de>
AuthorDate:    Mon, 14 Sep 2020 19:28:08 +02:00
Committer:     Paul E. McKenney <paulmck@kernel.org>
CommitterDate: Mon, 28 Sep 2020 16:03:20 -07:00

locking/bitspinlock: Cleanup PREEMPT_COUNT leftovers

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>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
 include/linux/bit_spinlock.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Patch
diff mbox series 

diff --git a/include/linux/bit_spinlock.h b/include/linux/bit_spinlock.h
index bbc4730..1e03d54 100644
--- a/include/linux/bit_spinlock.h
+++ b/include/linux/bit_spinlock.h
@@ -90,10 +90,8 @@  static inline int bit_spin_is_locked(int bitnum, unsigned long *addr)
 {
 #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
 }