hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f
kernel/kernel/time/timer.c
....@@ -1293,7 +1293,7 @@
12931293 u32 tf;
12941294
12951295 tf = READ_ONCE(timer->flags);
1296
- if (!(tf & (TIMER_MIGRATING | TIMER_IRQSAFE))) {
1296
+ if (!(tf & TIMER_MIGRATING)) {
12971297 struct timer_base *base = get_timer_base(tf);
12981298
12991299 /*
....@@ -1376,13 +1376,6 @@
13761376 * could lead to deadlock.
13771377 */
13781378 WARN_ON(in_irq() && !(timer->flags & TIMER_IRQSAFE));
1379
-
1380
- /*
1381
- * Must be able to sleep on PREEMPT_RT because of the slowpath in
1382
- * del_timer_wait_running().
1383
- */
1384
- if (IS_ENABLED(CONFIG_PREEMPT_RT) && !(timer->flags & TIMER_IRQSAFE))
1385
- lockdep_assert_preemption_enabled();
13861379
13871380 do {
13881381 ret = try_to_del_timer_sync(timer);