Konstantin Demin
c3d09a3e94
imported from https://salsa.debian.org/kernel-team/linux.git commit 9d5cc9d9d6501d7f1dd7e194d4b245bd0b6c6a22 version 6.11.4-1
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Mon, 12 Aug 2024 12:51:04 +0200
|
|
Subject: [PATCH 1/2] timers: Add sparse annotation for
|
|
timer_sync_wait_running().
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.11/older/patches-6.11-rt7.tar.xz
|
|
|
|
timer_sync_wait_running() first releases two locks and then acquires
|
|
them again. This is unexpected and sparse complains about it.
|
|
|
|
Add sparse annotation for timer_sync_wait_running() to note that the
|
|
locking is expected.
|
|
|
|
Link: https://lore.kernel.org/r/20240812105326.2240000-2-bigeasy@linutronix.de
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
kernel/time/timer.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/kernel/time/timer.c
|
|
+++ b/kernel/time/timer.c
|
|
@@ -1561,6 +1561,8 @@ static inline void timer_base_unlock_exp
|
|
* the waiter to acquire the lock and make progress.
|
|
*/
|
|
static void timer_sync_wait_running(struct timer_base *base)
|
|
+ __releases(&base->lock) __releases(&base->expiry_lock)
|
|
+ __acquires(&base->expiry_lock) __acquires(&base->lock)
|
|
{
|
|
if (atomic_read(&base->timer_waiters)) {
|
|
raw_spin_unlock_irq(&base->lock);
|