diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-15 15:02:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-15 15:02:58 +0200 |
| commit | 8d0a06b80222487ae8aa5fc499b2034574f564e5 (patch) | |
| tree | 9de0ac8e508e29b46b19aa527b516e295c7f1f9d | |
| parent | af7293b26295755bd4c9b089dd7aa2e3ff7e45b3 (diff) | |
| download | stable-queue-8d0a06b80222487ae8aa5fc499b2034574f564e5.tar.gz | |
6.1-stable patches
added patches:
irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch
| -rw-r--r-- | queue-6.1/irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch | 40 | ||||
| -rw-r--r-- | queue-6.1/series | 2 |
2 files changed, 41 insertions, 1 deletions
diff --git a/queue-6.1/irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch b/queue-6.1/irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch new file mode 100644 index 0000000000..da821d997a --- /dev/null +++ b/queue-6.1/irqflags-explicitly-ignore-lockdep_hrtimer_exit-argument.patch @@ -0,0 +1,40 @@ +From c1d11fc2c8320871b40730991071dd0a0b405bc8 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann <arnd@arndb.de> +Date: Mon, 8 Apr 2024 09:46:01 +0200 +Subject: irqflags: Explicitly ignore lockdep_hrtimer_exit() argument + +From: Arnd Bergmann <arnd@arndb.de> + +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 <lkp@intel.com> +Signed-off-by: Arnd Bergmann <arnd@arndb.de> +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +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 <gregkh@linuxfoundation.org> +--- + include/linux/irqflags.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/irqflags.h ++++ b/include/linux/irqflags.h +@@ -126,7 +126,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-6.1/series b/queue-6.1/series index ceeaa3fa19..04fc81cf54 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -36,7 +36,6 @@ af_unix-fix-garbage-collector-racing-against-connect.patch net-ena-fix-potential-sign-extension-issue.patch net-ena-wrong-missing-io-completions-check-order.patch net-ena-fix-incorrect-descriptor-free-behavior.patch -tracing-fix-ftrace_record_recursion_size-kconfig-ent.patch tracing-hide-unused-ftrace_event_id_fops.patch iommu-vt-d-allocate-local-memory-for-page-request-qu.patch btrfs-qgroup-correctly-model-root-qgroup-rsv-in-convert.patch @@ -54,3 +53,4 @@ perf-x86-fix-out-of-range-data.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 |