]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.6-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Aug 2026 09:18:39 +0000 (11:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Aug 2026 09:18:39 +0000 (11:18 +0200)
added patches:
revert-ia64-make-acpi_cpufreq_cpu_exit-return-void.patch

queue-6.6/revert-ia64-make-acpi_cpufreq_cpu_exit-return-void.patch [new file with mode: 0644]
queue-6.6/series

diff --git a/queue-6.6/revert-ia64-make-acpi_cpufreq_cpu_exit-return-void.patch b/queue-6.6/revert-ia64-make-acpi_cpufreq_cpu_exit-return-void.patch
new file mode 100644 (file)
index 0000000..bbf23f7
--- /dev/null
@@ -0,0 +1,42 @@
+From 7d213dde115b77ee5759ffffcdcd4a5026464d49 Mon Sep 17 00:00:00 2001
+From: Frank Scheiner <frank.scheiner@web.de>
+Date: Tue, 4 Aug 2026 15:48:08 +0200
+Subject: Revert "ia64: Make acpi_cpufreq_cpu_exit return void"
+
+From: Frank Scheiner <frank.scheiner@web.de>
+
+Commit b4b1ddc9dfe9 ("cpufreq: Make cpufreq_driver->exit() return
+void") was part of v6.6.145-rc1. But as it was derived from a
+later Linux version w/o support for ia64 it didn't touch all
+relevant parts in linux-6.6.y. Which now required an extra fix to
+build correctly for ia64. But b4b1ddc9dfe9 was then not part of
+the release v6.6.145. So the extra fix can go now, too.
+
+This reverts commit bb51b626b5a8ef349b11876572540f19ad4d5030.
+
+Signed-off-by: Frank Scheiner <frank.scheiner@web.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/cpufreq/ia64-acpi-cpufreq.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/cpufreq/ia64-acpi-cpufreq.c
++++ b/drivers/cpufreq/ia64-acpi-cpufreq.c
+@@ -302,7 +302,7 @@ acpi_cpufreq_cpu_init (
+ }
+-static void
++static int
+ acpi_cpufreq_cpu_exit (
+       struct cpufreq_policy   *policy)
+ {
+@@ -316,6 +316,8 @@ acpi_cpufreq_cpu_exit (
+               kfree(policy->freq_table);
+               kfree(data);
+       }
++
++      return (0);
+ }
index 88f5d8f2a459a615def4647b4201be76709e7d42..eef58279d20a3bb16d1cc31e159edc64c1d5a6e0 100644 (file)
@@ -210,3 +210,4 @@ mm-hugetlb-fix-swap-entry-corruption-when-clearing-u.patch
 mm-huge_memory-unlock-i_mmap_rwsem-before-releasing-.patch
 firmware-stratix10-svc-fix-memory-leaks-and-list-cor.patch
 gpio-pch-use-raw_spinlock_t-for-the-register-lock.patch
+revert-ia64-make-acpi_cpufreq_cpu_exit-return-void.patch