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

Message ID 160226288442.7002.6957761201817998290.tip-bot2@tip-bot2
State In Next
Commit 80b5756a17ad2bcd3947f48ce5cf2def5a30fb54
Headers show
Series
  • [tip:,core/rcu] xtensa: 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:     68e10f9fe712edbc69be2a1e2914ea6e31a9283f
Gitweb:        https://git.kernel.org/tip/68e10f9fe712edbc69be2a1e2914ea6e31a9283f
Author:        Thomas Gleixner <tglx@linutronix.de>
AuthorDate:    Mon, 14 Sep 2020 19:33:53 +02:00
Committer:     Paul E. McKenney <paulmck@kernel.org>
CommitterDate: Mon, 28 Sep 2020 16:03:22 -07:00

xtensa: 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>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-xtensa@linux-xtensa.org
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
 arch/xtensa/kernel/entry.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch
diff mbox series

diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 703cf62..5a27dd3 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -819,7 +819,7 @@  ENTRY(debug_exception)
 	 * preemption if we have HW breakpoints to preserve DEBUGCAUSE.DBNUM
 	 * meaning.
 	 */
-#if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_HAVE_HW_BREAKPOINT)
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
 	GET_THREAD_INFO(a2, a1)
 	l32i	a3, a2, TI_PRE_COUNT
 	addi	a3, a3, 1