From 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Thu, 16 May 2024 03:11:33 +0000
Subject: [PATCH] AX88772C_eeprom and ax8872c build together
---
kernel/kernel/time/timer.c | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/kernel/kernel/time/timer.c b/kernel/kernel/time/timer.c
index 72a3988..f5147bd 100644
--- a/kernel/kernel/time/timer.c
+++ b/kernel/kernel/time/timer.c
@@ -1293,7 +1293,7 @@
u32 tf;
tf = READ_ONCE(timer->flags);
- if (!(tf & (TIMER_MIGRATING | TIMER_IRQSAFE))) {
+ if (!(tf & TIMER_MIGRATING)) {
struct timer_base *base = get_timer_base(tf);
/*
@@ -1376,13 +1376,6 @@
* could lead to deadlock.
*/
WARN_ON(in_irq() && !(timer->flags & TIMER_IRQSAFE));
-
- /*
- * Must be able to sleep on PREEMPT_RT because of the slowpath in
- * del_timer_wait_running().
- */
- if (IS_ENABLED(CONFIG_PREEMPT_RT) && !(timer->flags & TIMER_IRQSAFE))
- lockdep_assert_preemption_enabled();
do {
ret = try_to_del_timer_sync(timer);
--
Gitblit v1.6.2