aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/locking/lock_events.h
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2024-07-04 16:00:24 +0200
committerPeter Zijlstra <peterz@infradead.org>2024-07-04 16:00:24 +0200
commit0c8ea05e9b3d8e5287e2a968f2a2e744dfd31b99 (patch)
treeba0443b74f063471c5d81d85e795e04e7e1dc79c /kernel/locking/lock_events.h
parentperf: Make rb_alloc_aux() return an error immediately if nr_pages <= 0 (diff)
parentx86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines (diff)
downloadlinux-0c8ea05e9b3d8e5287e2a968f2a2e744dfd31b99.tar.gz
linux-0c8ea05e9b3d8e5287e2a968f2a2e744dfd31b99.zip
Merge branch 'tip/x86/cpu'
The Lunarlake patches rely on the new VFM stuff. Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'kernel/locking/lock_events.h')
-rw-r--r--kernel/locking/lock_events.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/locking/lock_events.h b/kernel/locking/lock_events.h
index a6016b91803d..d2345e9c0190 100644
--- a/kernel/locking/lock_events.h
+++ b/kernel/locking/lock_events.h
@@ -53,8 +53,8 @@ static inline void __lockevent_add(enum lock_events event, int inc)
#else /* CONFIG_LOCK_EVENT_COUNTS */
#define lockevent_inc(ev)
-#define lockevent_add(ev, c)
-#define lockevent_cond_inc(ev, c)
+#define lockevent_add(ev, c) do { (void)(c); } while (0)
+#define lockevent_cond_inc(ev, c) do { (void)(c); } while (0)
#endif /* CONFIG_LOCK_EVENT_COUNTS */