From: Greg Kroah-Hartman Date: Mon, 15 Apr 2024 13:02:37 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.15.156~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=677c82813ce292808406b1d057a5374261257c3e;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch --- diff --git a/queue-5.10/irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch b/queue-5.10/irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch new file mode 100644 index 00000000000..6d12aa5c5b6 --- /dev/null +++ b/queue-5.10/irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch @@ -0,0 +1,40 @@ +From c1d11fc2c8320871b40730991071dd0a0b405bc8 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Mon, 8 Apr 2024 09:46:01 +0200 +Subject: irqflags: Explicitly ignore lockdep_hrtimer_exit() argument + +From: Arnd Bergmann + +commit c1d11fc2c8320871b40730991071dd0a0b405bc8 upstream. + +When building with 'make W=1' but CONFIG_TRACE_IRQFLAGS=n, the +unused argument to lockdep_hrtimer_exit() causes a warning: + +kernel/time/hrtimer.c:1655:14: error: variable 'expires_in_hardirq' set but not used [-Werror=unused-but-set-variable] + +This is intentional behavior, so add a cast to void to shut up the warning. + +Fixes: 73d20564e0dc ("hrtimer: Don't dereference the hrtimer pointer after the callback") +Reported-by: kernel test robot +Signed-off-by: Arnd Bergmann +Signed-off-by: Thomas Gleixner +Reviewed-by: Sebastian Andrzej Siewior +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20240408074609.3170807-1-arnd@kernel.org +Closes: https://lore.kernel.org/oe-kbuild-all/202311191229.55QXHVc6-lkp@intel.com/ +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/irqflags.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/irqflags.h ++++ b/include/linux/irqflags.h +@@ -133,7 +133,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) do { (void)(__context); } while (0) + # define lockdep_posixtimer_enter() do { } while (0) + # define lockdep_posixtimer_exit() do { } while (0) + # define lockdep_irq_work_enter(__work) do { } while (0) diff --git a/queue-5.10/series b/queue-5.10/series index 55ac248345b..4461a112df1 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -35,3 +35,4 @@ vhost-add-smp_rmb-in-vhost_vq_avail_empty.patch x86-cpu-actually-turn-off-mitigations-by-default-for-speculation_mitigations-n.patch selftests-timers-fix-abs-warning-in-posix_timers-test.patch x86-apic-force-native_apic_mem_read-to-use-the-mov-instruction.patch +irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch