From d6b58f9c6e7587b297e93b68c547dacde46bebdf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 28 Oct 2022 12:42:59 +0200 Subject: [PATCH] drop cpufreq-tegra194-fix-module-loading.patch from 5.10 and 5.15 breaks the build there and is not needed --- .../cpufreq-tegra194-fix-module-loading.patch | 32 ------------------- queue-5.10/series | 1 - .../cpufreq-tegra194-fix-module-loading.patch | 32 ------------------- queue-5.15/series | 1 - 4 files changed, 66 deletions(-) delete mode 100644 queue-5.10/cpufreq-tegra194-fix-module-loading.patch delete mode 100644 queue-5.15/cpufreq-tegra194-fix-module-loading.patch diff --git a/queue-5.10/cpufreq-tegra194-fix-module-loading.patch b/queue-5.10/cpufreq-tegra194-fix-module-loading.patch deleted file mode 100644 index 7d3a48c4dcb..00000000000 --- a/queue-5.10/cpufreq-tegra194-fix-module-loading.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1dcaf30725c32b26daa70d22083999972ab99c29 Mon Sep 17 00:00:00 2001 -From: Jon Hunter -Date: Tue, 11 Oct 2022 16:32:43 +0100 -Subject: cpufreq: tegra194: Fix module loading - -From: Jon Hunter - -commit 1dcaf30725c32b26daa70d22083999972ab99c29 upstream. - -When the Tegra194 CPUFREQ driver is built as a module it is not -automatically loaded as expected on Tegra194 devices. Populate the -MODULE_DEVICE_TABLE to fix this. - -Cc: v5.9+ # v5.9+ -Fixes: df320f89359c ("cpufreq: Add Tegra194 cpufreq driver") -Signed-off-by: Jon Hunter -Signed-off-by: Viresh Kumar -Signed-off-by: Greg Kroah-Hartman ---- - drivers/cpufreq/tegra194-cpufreq.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/cpufreq/tegra194-cpufreq.c -+++ b/drivers/cpufreq/tegra194-cpufreq.c -@@ -242,6 +242,7 @@ static struct cpufreq_driver tegra194_cp - .init = tegra194_cpufreq_init, - .attr = cpufreq_generic_attr, - }; -+MODULE_DEVICE_TABLE(of, tegra194_cpufreq_of_match); - - static void tegra194_cpufreq_free_resources(void) - { diff --git a/queue-5.10/series b/queue-5.10/series index ced698f05ad..c1724ca9303 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -3,7 +3,6 @@ ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch selinux-enable-use-of-both-gfp_kernel-and-gfp_atomic-in-convert_context.patch cpufreq-qcom-fix-writes-in-read-only-memory-region.patch i2c-qcom-cci-fix-ordering-of-pm_runtime_xx-and-i2c_add_adapter.patch -cpufreq-tegra194-fix-module-loading.patch x86-microcode-amd-apply-the-patch-early-on-every-logical-thread.patch hwmon-coretemp-handle-large-core-id-value.patch ata-ahci-imx-fix-module_alias.patch diff --git a/queue-5.15/cpufreq-tegra194-fix-module-loading.patch b/queue-5.15/cpufreq-tegra194-fix-module-loading.patch deleted file mode 100644 index 1be3411d8ca..00000000000 --- a/queue-5.15/cpufreq-tegra194-fix-module-loading.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1dcaf30725c32b26daa70d22083999972ab99c29 Mon Sep 17 00:00:00 2001 -From: Jon Hunter -Date: Tue, 11 Oct 2022 16:32:43 +0100 -Subject: cpufreq: tegra194: Fix module loading - -From: Jon Hunter - -commit 1dcaf30725c32b26daa70d22083999972ab99c29 upstream. - -When the Tegra194 CPUFREQ driver is built as a module it is not -automatically loaded as expected on Tegra194 devices. Populate the -MODULE_DEVICE_TABLE to fix this. - -Cc: v5.9+ # v5.9+ -Fixes: df320f89359c ("cpufreq: Add Tegra194 cpufreq driver") -Signed-off-by: Jon Hunter -Signed-off-by: Viresh Kumar -Signed-off-by: Greg Kroah-Hartman ---- - drivers/cpufreq/tegra194-cpufreq.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/cpufreq/tegra194-cpufreq.c -+++ b/drivers/cpufreq/tegra194-cpufreq.c -@@ -279,6 +279,7 @@ static struct cpufreq_driver tegra194_cp - .init = tegra194_cpufreq_init, - .attr = cpufreq_generic_attr, - }; -+MODULE_DEVICE_TABLE(of, tegra194_cpufreq_of_match); - - static void tegra194_cpufreq_free_resources(void) - { diff --git a/queue-5.15/series b/queue-5.15/series index b71615eef5c..38eb91bc615 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -13,7 +13,6 @@ ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch selinux-enable-use-of-both-gfp_kernel-and-gfp_atomic-in-convert_context.patch cpufreq-qcom-fix-writes-in-read-only-memory-region.patch i2c-qcom-cci-fix-ordering-of-pm_runtime_xx-and-i2c_add_adapter.patch -cpufreq-tegra194-fix-module-loading.patch x86-microcode-amd-apply-the-patch-early-on-every-logical-thread.patch hwmon-coretemp-handle-large-core-id-value.patch ata-ahci-imx-fix-module_alias.patch -- 2.47.3