[PATCH] hrtimer: Fix 'set but not used' warning with lockdep_hrtimer_exit

From: YiFei Zhu
Date: Sun Nov 13 2022 - 19:54:13 EST


In a defconfig build with 'unused-but-set-variable' enabled, we get:

kernel/time/hrtimer.c: In function ‘__run_hrtimer’:
kernel/time/hrtimer.c:1648:14: error: variable ‘expires_in_hardirq’
set but not used [-Werror=unused-but-set-variable]
1648 | bool expires_in_hardirq;
| ^~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Resolve this by evaluating expires_in_hardirq and casting it to void.

Reported-by: Thelford Williams <tdwilliamsiv@xxxxxxxxx>
Fixes: 40db173965c0 ("lockdep: Add hrtimer context tracing bits")
Signed-off-by: YiFei Zhu <zhuyifei@xxxxxxxxxx>
---
include/linux/irqflags.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 5ec0fa71399e..df74d0df8e1f 100644
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -125,7 +125,7 @@ do { \
# define lockdep_softirq_enter() do { } while (0)
# define lockdep_softirq_exit() do { } while (0)
# define lockdep_hrtimer_enter(__hrtimer) false
-# define lockdep_hrtimer_exit(__context) do { } while (0)
+# define lockdep_hrtimer_exit(__context) ((void)(__context))
# define lockdep_posixtimer_enter() do { } while (0)
# define lockdep_posixtimer_exit() do { } while (0)
# define lockdep_irq_work_enter(__work) do { } while (0)
--
2.38.1.493.g58b659f92b-goog