From: Greg Kroah-Hartman Date: Tue, 24 Oct 2023 08:19:07 +0000 (+0200) Subject: drop platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch X-Git-Tag: v4.14.328~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ff73c646020fd44971e27b931c2d29e1e9fa2ce;p=thirdparty%2Fkernel%2Fstable-queue.git drop platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch It's not needed. --- diff --git a/queue-4.14/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch b/queue-4.14/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch deleted file mode 100644 index 2af10a94771..00000000000 --- a/queue-4.14/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 956d3b5be914be989ba168c30d717fde304d8f3b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 Oct 2023 13:16:24 +0200 -Subject: platform/x86: hp-wmi:: Mark driver struct with __refdata to prevent - section mismatch warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Uwe Kleine-König - -[ Upstream commit 5b44abbc39ca15df80d0da4756078c98c831090f ] - -As described in the added code comment, a reference to .exit.text is ok -for drivers registered via module_platform_driver_probe(). Make this -explicit to prevent a section mismatch warning: - - WARNING: modpost: drivers/platform/x86/hp/hp-wmi: section mismatch in reference: hp_wmi_driver+0x8 (section: .data) -> hp_wmi_bios_remove (section: .exit.text) - -Fixes: c165b80cfecc ("hp-wmi: fix handling of platform device") -Signed-off-by: Uwe Kleine-König -Link: https://lore.kernel.org/r/20231004111624.2667753-1-u.kleine-koenig@pengutronix.de -Reviewed-by: Hans de Goede -Signed-off-by: Hans de Goede -Signed-off-by: Sasha Levin ---- - drivers/platform/x86/hp-wmi.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/drivers/platform/x86/hp-wmi.c -+++ b/drivers/platform/x86/hp-wmi.c -@@ -1001,7 +1001,13 @@ static const struct dev_pm_ops hp_wmi_pm - .restore = hp_wmi_resume_handler, - }; - --static struct platform_driver hp_wmi_driver = { -+/* -+ * hp_wmi_bios_remove() lives in .exit.text. For drivers registered via -+ * module_platform_driver_probe() this is ok because they cannot get unbound at -+ * runtime. So mark the driver struct with __refdata to prevent modpost -+ * triggering a section mismatch warning. -+ */ -+static struct platform_driver hp_wmi_driver __refdata = { - .driver = { - .name = "hp-wmi", - .pm = &hp_wmi_pm_ops, diff --git a/queue-4.14/series b/queue-4.14/series index 06a8fc7973f..32bca27ba80 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1,5 +1,4 @@ rdma-cxgb4-check-skb-value-for-failure-to-allocate.patch -platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch hid-logitech-hidpp-fix-kernel-crash-on-receiver-usb-disconnect.patch drm-etvnaviv-fix-bad-backport-leading-to-warning.patch ieee802154-ca8210-fix-a-potential-uaf-in-ca8210_prob.patch diff --git a/queue-4.19/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch b/queue-4.19/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch deleted file mode 100644 index 154f7f4fff2..00000000000 --- a/queue-4.19/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a4b467c1e7741ec60e6697f8edccaf83d29d61e8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 Oct 2023 13:16:24 +0200 -Subject: platform/x86: hp-wmi:: Mark driver struct with __refdata to prevent - section mismatch warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Uwe Kleine-König - -[ Upstream commit 5b44abbc39ca15df80d0da4756078c98c831090f ] - -As described in the added code comment, a reference to .exit.text is ok -for drivers registered via module_platform_driver_probe(). Make this -explicit to prevent a section mismatch warning: - - WARNING: modpost: drivers/platform/x86/hp/hp-wmi: section mismatch in reference: hp_wmi_driver+0x8 (section: .data) -> hp_wmi_bios_remove (section: .exit.text) - -Fixes: c165b80cfecc ("hp-wmi: fix handling of platform device") -Signed-off-by: Uwe Kleine-König -Link: https://lore.kernel.org/r/20231004111624.2667753-1-u.kleine-koenig@pengutronix.de -Reviewed-by: Hans de Goede -Signed-off-by: Hans de Goede -Signed-off-by: Sasha Levin ---- - drivers/platform/x86/hp-wmi.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/drivers/platform/x86/hp-wmi.c -+++ b/drivers/platform/x86/hp-wmi.c -@@ -1001,7 +1001,13 @@ static const struct dev_pm_ops hp_wmi_pm - .restore = hp_wmi_resume_handler, - }; - --static struct platform_driver hp_wmi_driver = { -+/* -+ * hp_wmi_bios_remove() lives in .exit.text. For drivers registered via -+ * module_platform_driver_probe() this is ok because they cannot get unbound at -+ * runtime. So mark the driver struct with __refdata to prevent modpost -+ * triggering a section mismatch warning. -+ */ -+static struct platform_driver hp_wmi_driver __refdata = { - .driver = { - .name = "hp-wmi", - .pm = &hp_wmi_pm_ops, diff --git a/queue-4.19/series b/queue-4.19/series index 965aa034316..92b80aafe72 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -3,7 +3,6 @@ net-use-indirect-calls-helpers-at-the-socket-layer.patch net-fix-kernel-doc-warnings-for-socket.c.patch net-prevent-rewrite-of-msg_name-in-sock_sendmsg.patch rdma-cxgb4-check-skb-value-for-failure-to-allocate.patch -platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch hid-logitech-hidpp-fix-kernel-crash-on-receiver-usb-disconnect.patch quota-fix-slow-quotaoff.patch net-prevent-address-rewrite-in-kernel_bind.patch diff --git a/queue-5.10/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch b/queue-5.10/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch deleted file mode 100644 index 1a05c152af6..00000000000 --- a/queue-5.10/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8b9c58c64c01a5088e1c95822d9035d2b7293e3b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 Oct 2023 13:16:24 +0200 -Subject: platform/x86: hp-wmi:: Mark driver struct with __refdata to prevent - section mismatch warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Uwe Kleine-König - -[ Upstream commit 5b44abbc39ca15df80d0da4756078c98c831090f ] - -As described in the added code comment, a reference to .exit.text is ok -for drivers registered via module_platform_driver_probe(). Make this -explicit to prevent a section mismatch warning: - - WARNING: modpost: drivers/platform/x86/hp/hp-wmi: section mismatch in reference: hp_wmi_driver+0x8 (section: .data) -> hp_wmi_bios_remove (section: .exit.text) - -Fixes: c165b80cfecc ("hp-wmi: fix handling of platform device") -Signed-off-by: Uwe Kleine-König -Link: https://lore.kernel.org/r/20231004111624.2667753-1-u.kleine-koenig@pengutronix.de -Reviewed-by: Hans de Goede -Signed-off-by: Hans de Goede -Signed-off-by: Sasha Levin ---- - drivers/platform/x86/hp-wmi.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c -index 6642d09b17b55..364d95cdaf2db 100644 ---- a/drivers/platform/x86/hp-wmi.c -+++ b/drivers/platform/x86/hp-wmi.c -@@ -986,7 +986,13 @@ static const struct dev_pm_ops hp_wmi_pm_ops = { - .restore = hp_wmi_resume_handler, - }; - --static struct platform_driver hp_wmi_driver = { -+/* -+ * hp_wmi_bios_remove() lives in .exit.text. For drivers registered via -+ * module_platform_driver_probe() this is ok because they cannot get unbound at -+ * runtime. So mark the driver struct with __refdata to prevent modpost -+ * triggering a section mismatch warning. -+ */ -+static struct platform_driver hp_wmi_driver __refdata = { - .driver = { - .name = "hp-wmi", - .pm = &hp_wmi_pm_ops, --- -2.40.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 06ff20db876..b905f746347 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -2,7 +2,6 @@ rdma-srp-make-struct-scsi_cmnd-and-struct-srp_reques.patch rdma-srp-do-not-call-scsi_done-from-srp_abort.patch rdma-cxgb4-check-skb-value-for-failure-to-allocate.patch perf-arm-cmn-fix-the-unhandled-overflow-status-of-co.patch -platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch lib-test_meminit-fix-off-by-one-error-in-test_pages.patch hid-logitech-hidpp-fix-kernel-crash-on-receiver-usb-disconnect.patch quota-fix-slow-quotaoff.patch diff --git a/queue-5.4/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch b/queue-5.4/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch deleted file mode 100644 index 5f2a84aad86..00000000000 --- a/queue-5.4/platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch +++ /dev/null @@ -1,51 +0,0 @@ -From cc07d5c31446b9ce43950ac7e0c63c3506dca785 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 Oct 2023 13:16:24 +0200 -Subject: platform/x86: hp-wmi:: Mark driver struct with __refdata to prevent - section mismatch warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Uwe Kleine-König - -[ Upstream commit 5b44abbc39ca15df80d0da4756078c98c831090f ] - -As described in the added code comment, a reference to .exit.text is ok -for drivers registered via module_platform_driver_probe(). Make this -explicit to prevent a section mismatch warning: - - WARNING: modpost: drivers/platform/x86/hp/hp-wmi: section mismatch in reference: hp_wmi_driver+0x8 (section: .data) -> hp_wmi_bios_remove (section: .exit.text) - -Fixes: c165b80cfecc ("hp-wmi: fix handling of platform device") -Signed-off-by: Uwe Kleine-König -Link: https://lore.kernel.org/r/20231004111624.2667753-1-u.kleine-koenig@pengutronix.de -Reviewed-by: Hans de Goede -Signed-off-by: Hans de Goede -Signed-off-by: Sasha Levin ---- - drivers/platform/x86/hp-wmi.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c -index d3a329b201b1e..f7d714a775300 100644 ---- a/drivers/platform/x86/hp-wmi.c -+++ b/drivers/platform/x86/hp-wmi.c -@@ -964,7 +964,13 @@ static const struct dev_pm_ops hp_wmi_pm_ops = { - .restore = hp_wmi_resume_handler, - }; - --static struct platform_driver hp_wmi_driver = { -+/* -+ * hp_wmi_bios_remove() lives in .exit.text. For drivers registered via -+ * module_platform_driver_probe() this is ok because they cannot get unbound at -+ * runtime. So mark the driver struct with __refdata to prevent modpost -+ * triggering a section mismatch warning. -+ */ -+static struct platform_driver hp_wmi_driver __refdata = { - .driver = { - .name = "hp-wmi", - .pm = &hp_wmi_pm_ops, --- -2.40.1 - diff --git a/queue-5.4/series b/queue-5.4/series index c852396143b..ed587fc454c 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,5 +1,4 @@ rdma-cxgb4-check-skb-value-for-failure-to-allocate.patch -platform-x86-hp-wmi-mark-driver-struct-with-__refdat.patch lib-test_meminit-fix-off-by-one-error-in-test_pages.patch pwm-hibvt-explicitly-set-.polarity-in-.get_state.patch hid-logitech-hidpp-fix-kernel-crash-on-receiver-usb-disconnect.patch