From 9989ac9b04da44de410a94e180e90cd2c2b6391e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 3 Apr 2022 08:33:56 +0200 Subject: [PATCH] drop some "anonymous module_init" functions that shouldn't be added to stable --- ..._h323-eliminate-anonymous-module_ini.patch | 74 --------- queue-4.14/series | 3 - ...ate-anonymous-module_init-module_exi.patch | 81 ---------- ...nate-anonymous-module_init-module_ex.patch | 82 ---------- ..._h323-eliminate-anonymous-module_ini.patch | 74 --------- queue-4.19/series | 3 - ...ate-anonymous-module_init-module_exi.patch | 81 ---------- ...nate-anonymous-module_init-module_ex.patch | 82 ---------- ..._h323-eliminate-anonymous-module_ini.patch | 74 --------- queue-4.9/series | 3 - ...ate-anonymous-module_init-module_exi.patch | 81 ---------- ...nate-anonymous-module_init-module_ex.patch | 82 ---------- ..._h323-eliminate-anonymous-module_ini.patch | 74 --------- queue-5.10/series | 4 - ...nate-anonymous-module_init-module_ex.patch | 150 ------------------ ...ate-anonymous-module_init-module_exi.patch | 81 ---------- ...nate-anonymous-module_init-module_ex.patch | 82 ---------- ..._h323-eliminate-anonymous-module_ini.patch | 74 --------- queue-5.15/series | 4 - ...nate-anonymous-module_init-module_ex.patch | 150 ------------------ ...ate-anonymous-module_init-module_exi.patch | 81 ---------- ...nate-anonymous-module_init-module_ex.patch | 82 ---------- ..._h323-eliminate-anonymous-module_ini.patch | 74 --------- queue-5.16/series | 4 - ...nate-anonymous-module_init-module_ex.patch | 150 ------------------ ...ate-anonymous-module_init-module_exi.patch | 81 ---------- ...nate-anonymous-module_init-module_ex.patch | 82 ---------- ..._h323-eliminate-anonymous-module_ini.patch | 74 --------- queue-5.17/series | 4 - ...nate-anonymous-module_init-module_ex.patch | 150 ------------------ ...ate-anonymous-module_init-module_exi.patch | 81 ---------- ...nate-anonymous-module_init-module_ex.patch | 82 ---------- ..._h323-eliminate-anonymous-module_ini.patch | 74 --------- queue-5.4/series | 3 - ...ate-anonymous-module_init-module_exi.patch | 81 ---------- ...nate-anonymous-module_init-module_ex.patch | 82 ---------- 36 files changed, 2524 deletions(-) delete mode 100644 queue-4.14/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch delete mode 100644 queue-4.14/usb-usbip-eliminate-anonymous-module_init-module_exi.patch delete mode 100644 queue-4.14/virtio_blk-eliminate-anonymous-module_init-module_ex.patch delete mode 100644 queue-4.19/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch delete mode 100644 queue-4.19/usb-usbip-eliminate-anonymous-module_init-module_exi.patch delete mode 100644 queue-4.19/virtio_blk-eliminate-anonymous-module_init-module_ex.patch delete mode 100644 queue-4.9/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch delete mode 100644 queue-4.9/usb-usbip-eliminate-anonymous-module_init-module_exi.patch delete mode 100644 queue-4.9/virtio_blk-eliminate-anonymous-module_init-module_ex.patch delete mode 100644 queue-5.10/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch delete mode 100644 queue-5.10/usb-gadget-eliminate-anonymous-module_init-module_ex.patch delete mode 100644 queue-5.10/usb-usbip-eliminate-anonymous-module_init-module_exi.patch delete mode 100644 queue-5.10/virtio_blk-eliminate-anonymous-module_init-module_ex.patch delete mode 100644 queue-5.15/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch delete mode 100644 queue-5.15/usb-gadget-eliminate-anonymous-module_init-module_ex.patch delete mode 100644 queue-5.15/usb-usbip-eliminate-anonymous-module_init-module_exi.patch delete mode 100644 queue-5.15/virtio_blk-eliminate-anonymous-module_init-module_ex.patch delete mode 100644 queue-5.16/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch delete mode 100644 queue-5.16/usb-gadget-eliminate-anonymous-module_init-module_ex.patch delete mode 100644 queue-5.16/usb-usbip-eliminate-anonymous-module_init-module_exi.patch delete mode 100644 queue-5.16/virtio_blk-eliminate-anonymous-module_init-module_ex.patch delete mode 100644 queue-5.17/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch delete mode 100644 queue-5.17/usb-gadget-eliminate-anonymous-module_init-module_ex.patch delete mode 100644 queue-5.17/usb-usbip-eliminate-anonymous-module_init-module_exi.patch delete mode 100644 queue-5.17/virtio_blk-eliminate-anonymous-module_init-module_ex.patch delete mode 100644 queue-5.4/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch delete mode 100644 queue-5.4/usb-usbip-eliminate-anonymous-module_init-module_exi.patch delete mode 100644 queue-5.4/virtio_blk-eliminate-anonymous-module_init-module_ex.patch diff --git a/queue-4.14/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch b/queue-4.14/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch deleted file mode 100644 index a3f314a393f..00000000000 --- a/queue-4.14/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 808d99ce8d4d5b743f7f51ca1542c869dace7f34 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:05 -0700 -Subject: netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit fd4213929053bb58b0b2a080ca17f2dd1a9b6df4 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") -Signed-off-by: Randy Dunlap -Acked-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c -index ac8342dcb55e..0a21dbfb40ad 100644 ---- a/net/ipv4/netfilter/nf_nat_h323.c -+++ b/net/ipv4/netfilter/nf_nat_h323.c -@@ -581,7 +581,7 @@ static struct nf_ct_helper_expectfn callforwarding_nat = { - }; - - /****************************************************************************/ --static int __init init(void) -+static int __init nf_nat_h323_init(void) - { - BUG_ON(set_h245_addr_hook != NULL); - BUG_ON(set_h225_addr_hook != NULL); -@@ -608,7 +608,7 @@ static int __init init(void) - } - - /****************************************************************************/ --static void __exit fini(void) -+static void __exit nf_nat_h323_fini(void) - { - RCU_INIT_POINTER(set_h245_addr_hook, NULL); - RCU_INIT_POINTER(set_h225_addr_hook, NULL); -@@ -625,8 +625,8 @@ static void __exit fini(void) - } - - /****************************************************************************/ --module_init(init); --module_exit(fini); -+module_init(nf_nat_h323_init); -+module_exit(nf_nat_h323_fini); - - MODULE_AUTHOR("Jing Min Zhao "); - MODULE_DESCRIPTION("H.323 NAT helper"); --- -2.34.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 5b504035373..ec85e36e43d 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -64,7 +64,6 @@ hwrng-atmel-disable-trng-on-failure-path.patch crypto-vmx-add-missing-dependencies.patch acpi-apei-fix-return-value-of-__setup-handlers.patch crypto-ccp-ccp_dmaengine_unregister-release-dma-chan.patch -virtio_blk-eliminate-anonymous-module_init-module_ex.patch hwmon-pmbus-add-vin-unit-off-handling.patch clocksource-acpi_pm-fix-return-value-of-__setup-hand.patch sched-debug-remove-mpol_get-put-and-task_lock-unlock.patch @@ -125,9 +124,7 @@ vxcan-enable-local-echo-for-sent-can-frames.patch mips-rb532-fix-return-value-of-__setup-handler.patch mtd-rawnand-atmel-fix-refcount-issue-in-atmel_nand_c.patch usb-storage-ums-realtek-fix-error-code-in-rts51x_rea.patch -usb-usbip-eliminate-anonymous-module_init-module_exi.patch af_netlink-fix-shift-out-of-bounds-in-group-mask-cal.patch -netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch i2c-mux-demux-pinctrl-do-not-deactivate-a-master-tha.patch net-bcmgenet-use-stronger-register-read-writes-to-as.patch tcp-ensure-pmtu-updates-are-processed-during-fastope.patch diff --git a/queue-4.14/usb-usbip-eliminate-anonymous-module_init-module_exi.patch b/queue-4.14/usb-usbip-eliminate-anonymous-module_init-module_exi.patch deleted file mode 100644 index d37603182e3..00000000000 --- a/queue-4.14/usb-usbip-eliminate-anonymous-module_init-module_exi.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 6d4ecbfe0839437fbcc3af3bf4770b1c87b43e97 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:08 -0700 -Subject: usb: usbip: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit 393dcd1f2b75e50783c805814a96bf6c8e11fe03 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") -Signed-off-by: Randy Dunlap -Cc: Krzysztof Opasiak -Cc: Igor Kotrasinski -Cc: Valentina Manea -Cc: Shuah Khan -Cc: Shuah Khan -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-8-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/usbip/vudc_main.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/usb/usbip/vudc_main.c b/drivers/usb/usbip/vudc_main.c -index 916e2eefc886..5f9d2a34c58a 100644 ---- a/drivers/usb/usbip/vudc_main.c -+++ b/drivers/usb/usbip/vudc_main.c -@@ -39,7 +39,7 @@ static struct platform_driver vudc_driver = { - - static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); - --static int __init init(void) -+static int __init vudc_init(void) - { - int retval = -ENOMEM; - int i; -@@ -97,9 +97,9 @@ static int __init init(void) - out: - return retval; - } --module_init(init); -+module_init(vudc_init); - --static void __exit cleanup(void) -+static void __exit vudc_cleanup(void) - { - struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; - -@@ -114,7 +114,7 @@ static void __exit cleanup(void) - } - platform_driver_unregister(&vudc_driver); - } --module_exit(cleanup); -+module_exit(vudc_cleanup); - - MODULE_DESCRIPTION("USB over IP Device Controller"); - MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski"); --- -2.34.1 - diff --git a/queue-4.14/virtio_blk-eliminate-anonymous-module_init-module_ex.patch b/queue-4.14/virtio_blk-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index 0045b6b8a1e..00000000000 --- a/queue-4.14/virtio_blk-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 61fbb4bbe8dc2de5fc0be0a8e6dc0aaa281d9e85 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:02 -0700 -Subject: virtio_blk: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit bcfe9b6cbb4438b8c1cc4bd475221652c8f9301b ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: e467cde23818 ("Block driver using virtio.") -Signed-off-by: Randy Dunlap -Cc: "Michael S. Tsirkin" -Cc: Jason Wang -Cc: Paolo Bonzini -Cc: Stefan Hajnoczi -Cc: virtualization@lists.linux-foundation.org -Cc: Jens Axboe -Cc: linux-block@vger.kernel.org -Reviewed-by: Stefan Hajnoczi -Acked-by: Jason Wang -Reviewed-by: Ira Weiny -Link: https://lore.kernel.org/r/20220316192010.19001-2-rdunlap@infradead.org -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/block/virtio_blk.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c -index 7e8f58c2f65b..394e97dd0f3b 100644 ---- a/drivers/block/virtio_blk.c -+++ b/drivers/block/virtio_blk.c -@@ -999,7 +999,7 @@ static struct virtio_driver virtio_blk = { - #endif - }; - --static int __init init(void) -+static int __init virtio_blk_init(void) - { - int error; - -@@ -1025,14 +1025,14 @@ static int __init init(void) - return error; - } - --static void __exit fini(void) -+static void __exit virtio_blk_fini(void) - { - unregister_virtio_driver(&virtio_blk); - unregister_blkdev(major, "virtblk"); - destroy_workqueue(virtblk_wq); - } --module_init(init); --module_exit(fini); -+module_init(virtio_blk_init); -+module_exit(virtio_blk_fini); - - MODULE_DEVICE_TABLE(virtio, id_table); - MODULE_DESCRIPTION("Virtio block driver"); --- -2.34.1 - diff --git a/queue-4.19/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch b/queue-4.19/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch deleted file mode 100644 index ca3817c5db3..00000000000 --- a/queue-4.19/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch +++ /dev/null @@ -1,74 +0,0 @@ -From ac64ce12e3f92c816ea6a5548e9e08eb9a6d9f9e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:05 -0700 -Subject: netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit fd4213929053bb58b0b2a080ca17f2dd1a9b6df4 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") -Signed-off-by: Randy Dunlap -Acked-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c -index 4e6b53ab6c33..fc5b8ce88741 100644 ---- a/net/ipv4/netfilter/nf_nat_h323.c -+++ b/net/ipv4/netfilter/nf_nat_h323.c -@@ -581,7 +581,7 @@ static struct nf_ct_helper_expectfn callforwarding_nat = { - }; - - /****************************************************************************/ --static int __init init(void) -+static int __init nf_nat_h323_init(void) - { - BUG_ON(set_h245_addr_hook != NULL); - BUG_ON(set_h225_addr_hook != NULL); -@@ -608,7 +608,7 @@ static int __init init(void) - } - - /****************************************************************************/ --static void __exit fini(void) -+static void __exit nf_nat_h323_fini(void) - { - RCU_INIT_POINTER(set_h245_addr_hook, NULL); - RCU_INIT_POINTER(set_h225_addr_hook, NULL); -@@ -625,8 +625,8 @@ static void __exit fini(void) - } - - /****************************************************************************/ --module_init(init); --module_exit(fini); -+module_init(nf_nat_h323_init); -+module_exit(nf_nat_h323_fini); - - MODULE_AUTHOR("Jing Min Zhao "); - MODULE_DESCRIPTION("H.323 NAT helper"); --- -2.34.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 071dbd4f0f7..18a9bc1dea5 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -79,7 +79,6 @@ crypto-vmx-add-missing-dependencies.patch clocksource-drivers-timer-of-check-return-value-of-o.patch acpi-apei-fix-return-value-of-__setup-handlers.patch crypto-ccp-ccp_dmaengine_unregister-release-dma-chan.patch -virtio_blk-eliminate-anonymous-module_init-module_ex.patch hwmon-pmbus-add-vin-unit-off-handling.patch clocksource-acpi_pm-fix-return-value-of-__setup-hand.patch sched-debug-remove-mpol_get-put-and-task_lock-unlock.patch @@ -151,9 +150,7 @@ vxcan-enable-local-echo-for-sent-can-frames.patch mips-rb532-fix-return-value-of-__setup-handler.patch mtd-rawnand-atmel-fix-refcount-issue-in-atmel_nand_c.patch usb-storage-ums-realtek-fix-error-code-in-rts51x_rea.patch -usb-usbip-eliminate-anonymous-module_init-module_exi.patch af_netlink-fix-shift-out-of-bounds-in-group-mask-cal.patch -netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch i2c-mux-demux-pinctrl-do-not-deactivate-a-master-tha.patch selftests-bpf-test_lirc_mode2.sh-exit-with-proper-co.patch net-bcmgenet-use-stronger-register-read-writes-to-as.patch diff --git a/queue-4.19/usb-usbip-eliminate-anonymous-module_init-module_exi.patch b/queue-4.19/usb-usbip-eliminate-anonymous-module_init-module_exi.patch deleted file mode 100644 index 82b1a832e1f..00000000000 --- a/queue-4.19/usb-usbip-eliminate-anonymous-module_init-module_exi.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 9bd1f40d460717b7293b03dc23aa9ef4bc47a6ea Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:08 -0700 -Subject: usb: usbip: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit 393dcd1f2b75e50783c805814a96bf6c8e11fe03 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") -Signed-off-by: Randy Dunlap -Cc: Krzysztof Opasiak -Cc: Igor Kotrasinski -Cc: Valentina Manea -Cc: Shuah Khan -Cc: Shuah Khan -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-8-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/usbip/vudc_main.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/usb/usbip/vudc_main.c b/drivers/usb/usbip/vudc_main.c -index 390733e6937e..aca6f1243cba 100644 ---- a/drivers/usb/usbip/vudc_main.c -+++ b/drivers/usb/usbip/vudc_main.c -@@ -27,7 +27,7 @@ static struct platform_driver vudc_driver = { - - static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); - --static int __init init(void) -+static int __init vudc_init(void) - { - int retval = -ENOMEM; - int i; -@@ -85,9 +85,9 @@ static int __init init(void) - out: - return retval; - } --module_init(init); -+module_init(vudc_init); - --static void __exit cleanup(void) -+static void __exit vudc_cleanup(void) - { - struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; - -@@ -102,7 +102,7 @@ static void __exit cleanup(void) - } - platform_driver_unregister(&vudc_driver); - } --module_exit(cleanup); -+module_exit(vudc_cleanup); - - MODULE_DESCRIPTION("USB over IP Device Controller"); - MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski"); --- -2.34.1 - diff --git a/queue-4.19/virtio_blk-eliminate-anonymous-module_init-module_ex.patch b/queue-4.19/virtio_blk-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index 6bea15ba27b..00000000000 --- a/queue-4.19/virtio_blk-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0adc828de95c76c138e29311d818298c611e9130 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:02 -0700 -Subject: virtio_blk: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit bcfe9b6cbb4438b8c1cc4bd475221652c8f9301b ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: e467cde23818 ("Block driver using virtio.") -Signed-off-by: Randy Dunlap -Cc: "Michael S. Tsirkin" -Cc: Jason Wang -Cc: Paolo Bonzini -Cc: Stefan Hajnoczi -Cc: virtualization@lists.linux-foundation.org -Cc: Jens Axboe -Cc: linux-block@vger.kernel.org -Reviewed-by: Stefan Hajnoczi -Acked-by: Jason Wang -Reviewed-by: Ira Weiny -Link: https://lore.kernel.org/r/20220316192010.19001-2-rdunlap@infradead.org -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/block/virtio_blk.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c -index 8b3bf11329ba..e3b1a22ed874 100644 ---- a/drivers/block/virtio_blk.c -+++ b/drivers/block/virtio_blk.c -@@ -1012,7 +1012,7 @@ static struct virtio_driver virtio_blk = { - #endif - }; - --static int __init init(void) -+static int __init virtio_blk_init(void) - { - int error; - -@@ -1038,14 +1038,14 @@ static int __init init(void) - return error; - } - --static void __exit fini(void) -+static void __exit virtio_blk_fini(void) - { - unregister_virtio_driver(&virtio_blk); - unregister_blkdev(major, "virtblk"); - destroy_workqueue(virtblk_wq); - } --module_init(init); --module_exit(fini); -+module_init(virtio_blk_init); -+module_exit(virtio_blk_fini); - - MODULE_DEVICE_TABLE(virtio, id_table); - MODULE_DESCRIPTION("Virtio block driver"); --- -2.34.1 - diff --git a/queue-4.9/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch b/queue-4.9/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch deleted file mode 100644 index 25841c03ba7..00000000000 --- a/queue-4.9/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch +++ /dev/null @@ -1,74 +0,0 @@ -From bed45b942879a2794ebd950020ded0292d52b4ba Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:05 -0700 -Subject: netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit fd4213929053bb58b0b2a080ca17f2dd1a9b6df4 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") -Signed-off-by: Randy Dunlap -Acked-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c -index ac8342dcb55e..0a21dbfb40ad 100644 ---- a/net/ipv4/netfilter/nf_nat_h323.c -+++ b/net/ipv4/netfilter/nf_nat_h323.c -@@ -581,7 +581,7 @@ static struct nf_ct_helper_expectfn callforwarding_nat = { - }; - - /****************************************************************************/ --static int __init init(void) -+static int __init nf_nat_h323_init(void) - { - BUG_ON(set_h245_addr_hook != NULL); - BUG_ON(set_h225_addr_hook != NULL); -@@ -608,7 +608,7 @@ static int __init init(void) - } - - /****************************************************************************/ --static void __exit fini(void) -+static void __exit nf_nat_h323_fini(void) - { - RCU_INIT_POINTER(set_h245_addr_hook, NULL); - RCU_INIT_POINTER(set_h225_addr_hook, NULL); -@@ -625,8 +625,8 @@ static void __exit fini(void) - } - - /****************************************************************************/ --module_init(init); --module_exit(fini); -+module_init(nf_nat_h323_init); -+module_exit(nf_nat_h323_fini); - - MODULE_AUTHOR("Jing Min Zhao "); - MODULE_DESCRIPTION("H.323 NAT helper"); --- -2.34.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 2e3ad0c5de5..ce54877fcc9 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -47,7 +47,6 @@ pm-hibernate-fix-__setup-handler-error-handling.patch pm-suspend-fix-return-value-of-__setup-handler.patch crypto-vmx-add-missing-dependencies.patch crypto-ccp-ccp_dmaengine_unregister-release-dma-chan.patch -virtio_blk-eliminate-anonymous-module_init-module_ex.patch hwmon-pmbus-add-vin-unit-off-handling.patch clocksource-acpi_pm-fix-return-value-of-__setup-hand.patch sched-debug-remove-mpol_get-put-and-task_lock-unlock.patch @@ -99,9 +98,7 @@ powerpc-sysdev-fix-incorrect-use-to-determine-if-lis.patch mfd-mc13xxx-add-check-for-mc13xxx_irq_request.patch mips-rb532-fix-return-value-of-__setup-handler.patch usb-storage-ums-realtek-fix-error-code-in-rts51x_rea.patch -usb-usbip-eliminate-anonymous-module_init-module_exi.patch af_netlink-fix-shift-out-of-bounds-in-group-mask-cal.patch -netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch i2c-mux-demux-pinctrl-do-not-deactivate-a-master-tha.patch mfd-asic3-add-missing-iounmap-on-error-asic3_mfd_pro.patch mxser-fix-xmit_buf-leak-in-activate-when-lsr-0xff.patch diff --git a/queue-4.9/usb-usbip-eliminate-anonymous-module_init-module_exi.patch b/queue-4.9/usb-usbip-eliminate-anonymous-module_init-module_exi.patch deleted file mode 100644 index e934eacc2d2..00000000000 --- a/queue-4.9/usb-usbip-eliminate-anonymous-module_init-module_exi.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 7ee7c57e1a6fecdbd8726b0521ba8c2339cbb38d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:08 -0700 -Subject: usb: usbip: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit 393dcd1f2b75e50783c805814a96bf6c8e11fe03 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") -Signed-off-by: Randy Dunlap -Cc: Krzysztof Opasiak -Cc: Igor Kotrasinski -Cc: Valentina Manea -Cc: Shuah Khan -Cc: Shuah Khan -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-8-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/usbip/vudc_main.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/usb/usbip/vudc_main.c b/drivers/usb/usbip/vudc_main.c -index 916e2eefc886..5f9d2a34c58a 100644 ---- a/drivers/usb/usbip/vudc_main.c -+++ b/drivers/usb/usbip/vudc_main.c -@@ -39,7 +39,7 @@ static struct platform_driver vudc_driver = { - - static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); - --static int __init init(void) -+static int __init vudc_init(void) - { - int retval = -ENOMEM; - int i; -@@ -97,9 +97,9 @@ static int __init init(void) - out: - return retval; - } --module_init(init); -+module_init(vudc_init); - --static void __exit cleanup(void) -+static void __exit vudc_cleanup(void) - { - struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; - -@@ -114,7 +114,7 @@ static void __exit cleanup(void) - } - platform_driver_unregister(&vudc_driver); - } --module_exit(cleanup); -+module_exit(vudc_cleanup); - - MODULE_DESCRIPTION("USB over IP Device Controller"); - MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski"); --- -2.34.1 - diff --git a/queue-4.9/virtio_blk-eliminate-anonymous-module_init-module_ex.patch b/queue-4.9/virtio_blk-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index 38420c06199..00000000000 --- a/queue-4.9/virtio_blk-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 47f1a99cbf91ce8bf7e9517375a39449cb3023fb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:02 -0700 -Subject: virtio_blk: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit bcfe9b6cbb4438b8c1cc4bd475221652c8f9301b ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: e467cde23818 ("Block driver using virtio.") -Signed-off-by: Randy Dunlap -Cc: "Michael S. Tsirkin" -Cc: Jason Wang -Cc: Paolo Bonzini -Cc: Stefan Hajnoczi -Cc: virtualization@lists.linux-foundation.org -Cc: Jens Axboe -Cc: linux-block@vger.kernel.org -Reviewed-by: Stefan Hajnoczi -Acked-by: Jason Wang -Reviewed-by: Ira Weiny -Link: https://lore.kernel.org/r/20220316192010.19001-2-rdunlap@infradead.org -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/block/virtio_blk.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c -index 45bd0d7d6a94..f5efb9d4bfd6 100644 ---- a/drivers/block/virtio_blk.c -+++ b/drivers/block/virtio_blk.c -@@ -865,7 +865,7 @@ static struct virtio_driver virtio_blk = { - #endif - }; - --static int __init init(void) -+static int __init virtio_blk_init(void) - { - int error; - -@@ -891,14 +891,14 @@ static int __init init(void) - return error; - } - --static void __exit fini(void) -+static void __exit virtio_blk_fini(void) - { - unregister_virtio_driver(&virtio_blk); - unregister_blkdev(major, "virtblk"); - destroy_workqueue(virtblk_wq); - } --module_init(init); --module_exit(fini); -+module_init(virtio_blk_init); -+module_exit(virtio_blk_fini); - - MODULE_DEVICE_TABLE(virtio, id_table); - MODULE_DESCRIPTION("Virtio block driver"); --- -2.34.1 - diff --git a/queue-5.10/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch b/queue-5.10/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch deleted file mode 100644 index e5ec6aff15a..00000000000 --- a/queue-5.10/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch +++ /dev/null @@ -1,74 +0,0 @@ -From f90b1db8f5190c3f503d1fdc14a114ebc993b9d6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:05 -0700 -Subject: netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit fd4213929053bb58b0b2a080ca17f2dd1a9b6df4 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") -Signed-off-by: Randy Dunlap -Acked-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c -index 3e2685c120c7..76a411ae9fe6 100644 ---- a/net/ipv4/netfilter/nf_nat_h323.c -+++ b/net/ipv4/netfilter/nf_nat_h323.c -@@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn callforwarding_nat = { - }; - - /****************************************************************************/ --static int __init init(void) -+static int __init nf_nat_h323_init(void) - { - BUG_ON(set_h245_addr_hook != NULL); - BUG_ON(set_h225_addr_hook != NULL); -@@ -607,7 +607,7 @@ static int __init init(void) - } - - /****************************************************************************/ --static void __exit fini(void) -+static void __exit nf_nat_h323_fini(void) - { - RCU_INIT_POINTER(set_h245_addr_hook, NULL); - RCU_INIT_POINTER(set_h225_addr_hook, NULL); -@@ -624,8 +624,8 @@ static void __exit fini(void) - } - - /****************************************************************************/ --module_init(init); --module_exit(fini); -+module_init(nf_nat_h323_init); -+module_exit(nf_nat_h323_fini); - - MODULE_AUTHOR("Jing Min Zhao "); - MODULE_DESCRIPTION("H.323 NAT helper"); --- -2.34.1 - diff --git a/queue-5.10/series b/queue-5.10/series index ff9ae6c5b92..ba6ac195393 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -164,7 +164,6 @@ crypto-ccree-fix-use-after-free-in-cc_cipher_exit.patch vfio-platform-simplify-device-removal.patch amba-make-the-remove-callback-return-void.patch hwrng-nomadik-change-clk_disable-to-clk_disable_unpr.patch -virtio_blk-eliminate-anonymous-module_init-module_ex.patch hwmon-pmbus-add-vin-unit-off-handling.patch clocksource-acpi_pm-fix-return-value-of-__setup-hand.patch io_uring-terminate-manual-loop-iterator-loop-correct.patch @@ -362,15 +361,12 @@ usb-storage-ums-realtek-fix-error-code-in-rts51x_rea.patch can-isotp-return-eaddrnotavail-when-reading-from-unb.patch can-isotp-support-msg_trunc-flag-when-reading-from-s.patch bareudp-use-ipv6_mod_enabled-to-check-if-ipv6-enable.patch -usb-usbip-eliminate-anonymous-module_init-module_exi.patch -usb-gadget-eliminate-anonymous-module_init-module_ex.patch selftests-bpf-fix-error-reporting-from-sock_fields-p.patch bluetooth-call-hci_le_conn_failed-with-hdev-lock-in-.patch bluetooth-btmtksdio-fix-kernel-oops-in-btmtksdio_int.patch ipv4-fix-route-lookups-when-handling-icmp-redirects-.patch af_netlink-fix-shift-out-of-bounds-in-group-mask-cal.patch i2c-meson-fix-wrong-speed-use-from-probe.patch -netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch i2c-mux-demux-pinctrl-do-not-deactivate-a-master-tha.patch selftests-bpf-test_lirc_mode2.sh-exit-with-proper-co.patch pci-avoid-broken-msi-on-sb600-usb-devices.patch diff --git a/queue-5.10/usb-gadget-eliminate-anonymous-module_init-module_ex.patch b/queue-5.10/usb-gadget-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index 3d343621aca..00000000000 --- a/queue-5.10/usb-gadget-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 815ad7a61668a2854d1ee4a43af3656ff8a66f6d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:07 -0700 -Subject: usb: gadget: eliminate anonymous module_init & module_exit -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Randy Dunlap - -[ Upstream commit 6653b827613aa301de691842c38f01e874604f88 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: bd25a14edb75 ("usb: gadget: legacy/serial: allow dynamic removal") -Fixes: 7bb5ea54be47 ("usb gadget serial: use composite gadget framework") -Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") -Signed-off-by: Randy Dunlap -Reviewed-by: Ira Weiny -Cc: Felipe Balbi -Cc: Michał Mirosław -Cc: Sebastian Andrzej Siewior -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-7-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/gadget/legacy/inode.c | 8 ++++---- - drivers/usb/gadget/legacy/serial.c | 10 +++++----- - drivers/usb/gadget/udc/dummy_hcd.c | 8 ++++---- - 3 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c -index 454860d52ce7..54b8498568a9 100644 ---- a/drivers/usb/gadget/legacy/inode.c -+++ b/drivers/usb/gadget/legacy/inode.c -@@ -2103,7 +2103,7 @@ MODULE_ALIAS_FS("gadgetfs"); - - /*----------------------------------------------------------------------*/ - --static int __init init (void) -+static int __init gadgetfs_init (void) - { - int status; - -@@ -2113,12 +2113,12 @@ static int __init init (void) - shortname, driver_desc); - return status; - } --module_init (init); -+module_init (gadgetfs_init); - --static void __exit cleanup (void) -+static void __exit gadgetfs_cleanup (void) - { - pr_debug ("unregister %s\n", shortname); - unregister_filesystem (&gadgetfs_type); - } --module_exit (cleanup); -+module_exit (gadgetfs_cleanup); - -diff --git a/drivers/usb/gadget/legacy/serial.c b/drivers/usb/gadget/legacy/serial.c -index da44f89f5e73..dcd3a6603d90 100644 ---- a/drivers/usb/gadget/legacy/serial.c -+++ b/drivers/usb/gadget/legacy/serial.c -@@ -273,7 +273,7 @@ static struct usb_composite_driver gserial_driver = { - static int switch_gserial_enable(bool do_enable) - { - if (!serial_config_driver.label) -- /* init() was not called, yet */ -+ /* gserial_init() was not called, yet */ - return 0; - - if (do_enable) -@@ -283,7 +283,7 @@ static int switch_gserial_enable(bool do_enable) - return 0; - } - --static int __init init(void) -+static int __init gserial_init(void) - { - /* We *could* export two configs; that'd be much cleaner... - * but neither of these product IDs was defined that way. -@@ -314,11 +314,11 @@ static int __init init(void) - - return usb_composite_probe(&gserial_driver); - } --module_init(init); -+module_init(gserial_init); - --static void __exit cleanup(void) -+static void __exit gserial_cleanup(void) - { - if (enable) - usb_composite_unregister(&gserial_driver); - } --module_exit(cleanup); -+module_exit(gserial_cleanup); -diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c -index 92d01ddaee0d..7cf0b03e2a0c 100644 ---- a/drivers/usb/gadget/udc/dummy_hcd.c -+++ b/drivers/usb/gadget/udc/dummy_hcd.c -@@ -2752,7 +2752,7 @@ static struct platform_driver dummy_hcd_driver = { - static struct platform_device *the_udc_pdev[MAX_NUM_UDC]; - static struct platform_device *the_hcd_pdev[MAX_NUM_UDC]; - --static int __init init(void) -+static int __init dummy_hcd_init(void) - { - int retval = -ENOMEM; - int i; -@@ -2874,9 +2874,9 @@ static int __init init(void) - platform_device_put(the_hcd_pdev[i]); - return retval; - } --module_init(init); -+module_init(dummy_hcd_init); - --static void __exit cleanup(void) -+static void __exit dummy_hcd_cleanup(void) - { - int i; - -@@ -2892,4 +2892,4 @@ static void __exit cleanup(void) - platform_driver_unregister(&dummy_udc_driver); - platform_driver_unregister(&dummy_hcd_driver); - } --module_exit(cleanup); -+module_exit(dummy_hcd_cleanup); --- -2.34.1 - diff --git a/queue-5.10/usb-usbip-eliminate-anonymous-module_init-module_exi.patch b/queue-5.10/usb-usbip-eliminate-anonymous-module_init-module_exi.patch deleted file mode 100644 index 2243ab5fd34..00000000000 --- a/queue-5.10/usb-usbip-eliminate-anonymous-module_init-module_exi.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 7d20d35d4a05a92d34dce263eeb63bf3b340f2e7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:08 -0700 -Subject: usb: usbip: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit 393dcd1f2b75e50783c805814a96bf6c8e11fe03 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") -Signed-off-by: Randy Dunlap -Cc: Krzysztof Opasiak -Cc: Igor Kotrasinski -Cc: Valentina Manea -Cc: Shuah Khan -Cc: Shuah Khan -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-8-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/usbip/vudc_main.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/usb/usbip/vudc_main.c b/drivers/usb/usbip/vudc_main.c -index 678faa82598c..1ff277764093 100644 ---- a/drivers/usb/usbip/vudc_main.c -+++ b/drivers/usb/usbip/vudc_main.c -@@ -28,7 +28,7 @@ static struct platform_driver vudc_driver = { - - static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); - --static int __init init(void) -+static int __init vudc_init(void) - { - int retval = -ENOMEM; - int i; -@@ -86,9 +86,9 @@ static int __init init(void) - out: - return retval; - } --module_init(init); -+module_init(vudc_init); - --static void __exit cleanup(void) -+static void __exit vudc_cleanup(void) - { - struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; - -@@ -103,7 +103,7 @@ static void __exit cleanup(void) - } - platform_driver_unregister(&vudc_driver); - } --module_exit(cleanup); -+module_exit(vudc_cleanup); - - MODULE_DESCRIPTION("USB over IP Device Controller"); - MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski"); --- -2.34.1 - diff --git a/queue-5.10/virtio_blk-eliminate-anonymous-module_init-module_ex.patch b/queue-5.10/virtio_blk-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index 0c1885f2c7a..00000000000 --- a/queue-5.10/virtio_blk-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,82 +0,0 @@ -From a93e9882f4cc8701f0f871cc9fa8a58e4b9e0a79 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:02 -0700 -Subject: virtio_blk: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit bcfe9b6cbb4438b8c1cc4bd475221652c8f9301b ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: e467cde23818 ("Block driver using virtio.") -Signed-off-by: Randy Dunlap -Cc: "Michael S. Tsirkin" -Cc: Jason Wang -Cc: Paolo Bonzini -Cc: Stefan Hajnoczi -Cc: virtualization@lists.linux-foundation.org -Cc: Jens Axboe -Cc: linux-block@vger.kernel.org -Reviewed-by: Stefan Hajnoczi -Acked-by: Jason Wang -Reviewed-by: Ira Weiny -Link: https://lore.kernel.org/r/20220316192010.19001-2-rdunlap@infradead.org -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/block/virtio_blk.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c -index 02e2056780ad..d87ad2b66a1f 100644 ---- a/drivers/block/virtio_blk.c -+++ b/drivers/block/virtio_blk.c -@@ -1017,7 +1017,7 @@ static struct virtio_driver virtio_blk = { - #endif - }; - --static int __init init(void) -+static int __init virtio_blk_init(void) - { - int error; - -@@ -1043,14 +1043,14 @@ static int __init init(void) - return error; - } - --static void __exit fini(void) -+static void __exit virtio_blk_fini(void) - { - unregister_virtio_driver(&virtio_blk); - unregister_blkdev(major, "virtblk"); - destroy_workqueue(virtblk_wq); - } --module_init(init); --module_exit(fini); -+module_init(virtio_blk_init); -+module_exit(virtio_blk_fini); - - MODULE_DEVICE_TABLE(virtio, id_table); - MODULE_DESCRIPTION("Virtio block driver"); --- -2.34.1 - diff --git a/queue-5.15/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch b/queue-5.15/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch deleted file mode 100644 index cbf31416c21..00000000000 --- a/queue-5.15/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 64dd0c45d9aa526ee43c2075a2f81b484cf4665d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:05 -0700 -Subject: netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit fd4213929053bb58b0b2a080ca17f2dd1a9b6df4 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") -Signed-off-by: Randy Dunlap -Acked-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c -index 3e2685c120c7..76a411ae9fe6 100644 ---- a/net/ipv4/netfilter/nf_nat_h323.c -+++ b/net/ipv4/netfilter/nf_nat_h323.c -@@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn callforwarding_nat = { - }; - - /****************************************************************************/ --static int __init init(void) -+static int __init nf_nat_h323_init(void) - { - BUG_ON(set_h245_addr_hook != NULL); - BUG_ON(set_h225_addr_hook != NULL); -@@ -607,7 +607,7 @@ static int __init init(void) - } - - /****************************************************************************/ --static void __exit fini(void) -+static void __exit nf_nat_h323_fini(void) - { - RCU_INIT_POINTER(set_h245_addr_hook, NULL); - RCU_INIT_POINTER(set_h225_addr_hook, NULL); -@@ -624,8 +624,8 @@ static void __exit fini(void) - } - - /****************************************************************************/ --module_init(init); --module_exit(fini); -+module_init(nf_nat_h323_init); -+module_exit(nf_nat_h323_fini); - - MODULE_AUTHOR("Jing Min Zhao "); - MODULE_DESCRIPTION("H.323 NAT helper"); --- -2.34.1 - diff --git a/queue-5.15/series b/queue-5.15/series index df815a6193a..27f062cc059 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -237,7 +237,6 @@ acpi-apei-fix-return-value-of-__setup-handlers.patch crypto-ccp-ccp_dmaengine_unregister-release-dma-chan.patch crypto-ccree-fix-use-after-free-in-cc_cipher_exit.patch hwrng-nomadik-change-clk_disable-to-clk_disable_unpr.patch -virtio_blk-eliminate-anonymous-module_init-module_ex.patch hwmon-pmbus-add-vin-unit-off-handling.patch clocksource-acpi_pm-fix-return-value-of-__setup-hand.patch io_uring-don-t-check-unrelated-req-open.how-in-accep.patch @@ -552,8 +551,6 @@ can-isotp-sanitize-can-id-checks-in-isotp_bind.patch can-isotp-return-eaddrnotavail-when-reading-from-unb.patch can-isotp-support-msg_trunc-flag-when-reading-from-s.patch bareudp-use-ipv6_mod_enabled-to-check-if-ipv6-enable.patch -usb-usbip-eliminate-anonymous-module_init-module_exi.patch -usb-gadget-eliminate-anonymous-module_init-module_ex.patch ibmvnic-fix-race-between-xmit-and-reset.patch af_unix-fix-some-data-races-around-unix_sk-sk-oob_sk.patch selftests-bpf-fix-error-reporting-from-sock_fields-p.patch @@ -564,7 +561,6 @@ ipv4-fix-route-lookups-when-handling-icmp-redirects-.patch af_netlink-fix-shift-out-of-bounds-in-group-mask-cal.patch i2c-meson-fix-wrong-speed-use-from-probe.patch netfilter-conntrack-add-and-use-nf_ct_set_auto_assig.patch -netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch i2c-mux-demux-pinctrl-do-not-deactivate-a-master-tha.patch powerpc-pseries-fix-use-after-free-in-remove_phb_dyn.patch selftests-bpf-test_lirc_mode2.sh-exit-with-proper-co.patch diff --git a/queue-5.15/usb-gadget-eliminate-anonymous-module_init-module_ex.patch b/queue-5.15/usb-gadget-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index 571feccf80c..00000000000 --- a/queue-5.15/usb-gadget-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 54eb622d35d2d09f185ec8b79f071aa308011e6d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:07 -0700 -Subject: usb: gadget: eliminate anonymous module_init & module_exit -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Randy Dunlap - -[ Upstream commit 6653b827613aa301de691842c38f01e874604f88 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: bd25a14edb75 ("usb: gadget: legacy/serial: allow dynamic removal") -Fixes: 7bb5ea54be47 ("usb gadget serial: use composite gadget framework") -Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") -Signed-off-by: Randy Dunlap -Reviewed-by: Ira Weiny -Cc: Felipe Balbi -Cc: Michał Mirosław -Cc: Sebastian Andrzej Siewior -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-7-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/gadget/legacy/inode.c | 8 ++++---- - drivers/usb/gadget/legacy/serial.c | 10 +++++----- - drivers/usb/gadget/udc/dummy_hcd.c | 8 ++++---- - 3 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c -index 3279b4767424..d15ced45b43e 100644 ---- a/drivers/usb/gadget/legacy/inode.c -+++ b/drivers/usb/gadget/legacy/inode.c -@@ -2104,7 +2104,7 @@ MODULE_ALIAS_FS("gadgetfs"); - - /*----------------------------------------------------------------------*/ - --static int __init init (void) -+static int __init gadgetfs_init (void) - { - int status; - -@@ -2114,12 +2114,12 @@ static int __init init (void) - shortname, driver_desc); - return status; - } --module_init (init); -+module_init (gadgetfs_init); - --static void __exit cleanup (void) -+static void __exit gadgetfs_cleanup (void) - { - pr_debug ("unregister %s\n", shortname); - unregister_filesystem (&gadgetfs_type); - } --module_exit (cleanup); -+module_exit (gadgetfs_cleanup); - -diff --git a/drivers/usb/gadget/legacy/serial.c b/drivers/usb/gadget/legacy/serial.c -index da44f89f5e73..dcd3a6603d90 100644 ---- a/drivers/usb/gadget/legacy/serial.c -+++ b/drivers/usb/gadget/legacy/serial.c -@@ -273,7 +273,7 @@ static struct usb_composite_driver gserial_driver = { - static int switch_gserial_enable(bool do_enable) - { - if (!serial_config_driver.label) -- /* init() was not called, yet */ -+ /* gserial_init() was not called, yet */ - return 0; - - if (do_enable) -@@ -283,7 +283,7 @@ static int switch_gserial_enable(bool do_enable) - return 0; - } - --static int __init init(void) -+static int __init gserial_init(void) - { - /* We *could* export two configs; that'd be much cleaner... - * but neither of these product IDs was defined that way. -@@ -314,11 +314,11 @@ static int __init init(void) - - return usb_composite_probe(&gserial_driver); - } --module_init(init); -+module_init(gserial_init); - --static void __exit cleanup(void) -+static void __exit gserial_cleanup(void) - { - if (enable) - usb_composite_unregister(&gserial_driver); - } --module_exit(cleanup); -+module_exit(gserial_cleanup); -diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c -index a2d956af42a2..b8cde6d94e4b 100644 ---- a/drivers/usb/gadget/udc/dummy_hcd.c -+++ b/drivers/usb/gadget/udc/dummy_hcd.c -@@ -2765,7 +2765,7 @@ static struct platform_driver dummy_hcd_driver = { - static struct platform_device *the_udc_pdev[MAX_NUM_UDC]; - static struct platform_device *the_hcd_pdev[MAX_NUM_UDC]; - --static int __init init(void) -+static int __init dummy_hcd_init(void) - { - int retval = -ENOMEM; - int i; -@@ -2887,9 +2887,9 @@ static int __init init(void) - platform_device_put(the_hcd_pdev[i]); - return retval; - } --module_init(init); -+module_init(dummy_hcd_init); - --static void __exit cleanup(void) -+static void __exit dummy_hcd_cleanup(void) - { - int i; - -@@ -2905,4 +2905,4 @@ static void __exit cleanup(void) - platform_driver_unregister(&dummy_udc_driver); - platform_driver_unregister(&dummy_hcd_driver); - } --module_exit(cleanup); -+module_exit(dummy_hcd_cleanup); --- -2.34.1 - diff --git a/queue-5.15/usb-usbip-eliminate-anonymous-module_init-module_exi.patch b/queue-5.15/usb-usbip-eliminate-anonymous-module_init-module_exi.patch deleted file mode 100644 index 6006491202c..00000000000 --- a/queue-5.15/usb-usbip-eliminate-anonymous-module_init-module_exi.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 7a6e8b438d1cefd513e79d1f4ddc62cd7a4baff1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:08 -0700 -Subject: usb: usbip: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit 393dcd1f2b75e50783c805814a96bf6c8e11fe03 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") -Signed-off-by: Randy Dunlap -Cc: Krzysztof Opasiak -Cc: Igor Kotrasinski -Cc: Valentina Manea -Cc: Shuah Khan -Cc: Shuah Khan -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-8-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/usbip/vudc_main.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/usb/usbip/vudc_main.c b/drivers/usb/usbip/vudc_main.c -index 678faa82598c..1ff277764093 100644 ---- a/drivers/usb/usbip/vudc_main.c -+++ b/drivers/usb/usbip/vudc_main.c -@@ -28,7 +28,7 @@ static struct platform_driver vudc_driver = { - - static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); - --static int __init init(void) -+static int __init vudc_init(void) - { - int retval = -ENOMEM; - int i; -@@ -86,9 +86,9 @@ static int __init init(void) - out: - return retval; - } --module_init(init); -+module_init(vudc_init); - --static void __exit cleanup(void) -+static void __exit vudc_cleanup(void) - { - struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; - -@@ -103,7 +103,7 @@ static void __exit cleanup(void) - } - platform_driver_unregister(&vudc_driver); - } --module_exit(cleanup); -+module_exit(vudc_cleanup); - - MODULE_DESCRIPTION("USB over IP Device Controller"); - MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski"); --- -2.34.1 - diff --git a/queue-5.15/virtio_blk-eliminate-anonymous-module_init-module_ex.patch b/queue-5.15/virtio_blk-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index edbd5763e02..00000000000 --- a/queue-5.15/virtio_blk-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,82 +0,0 @@ -From a3e643623f01d8bf24904725be7958bd0763f66e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:02 -0700 -Subject: virtio_blk: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit bcfe9b6cbb4438b8c1cc4bd475221652c8f9301b ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: e467cde23818 ("Block driver using virtio.") -Signed-off-by: Randy Dunlap -Cc: "Michael S. Tsirkin" -Cc: Jason Wang -Cc: Paolo Bonzini -Cc: Stefan Hajnoczi -Cc: virtualization@lists.linux-foundation.org -Cc: Jens Axboe -Cc: linux-block@vger.kernel.org -Reviewed-by: Stefan Hajnoczi -Acked-by: Jason Wang -Reviewed-by: Ira Weiny -Link: https://lore.kernel.org/r/20220316192010.19001-2-rdunlap@infradead.org -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/block/virtio_blk.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c -index c0b8a26892a5..ef520152f5b6 100644 ---- a/drivers/block/virtio_blk.c -+++ b/drivers/block/virtio_blk.c -@@ -1008,7 +1008,7 @@ static struct virtio_driver virtio_blk = { - #endif - }; - --static int __init init(void) -+static int __init virtio_blk_init(void) - { - int error; - -@@ -1034,14 +1034,14 @@ static int __init init(void) - return error; - } - --static void __exit fini(void) -+static void __exit virtio_blk_fini(void) - { - unregister_virtio_driver(&virtio_blk); - unregister_blkdev(major, "virtblk"); - destroy_workqueue(virtblk_wq); - } --module_init(init); --module_exit(fini); -+module_init(virtio_blk_init); -+module_exit(virtio_blk_fini); - - MODULE_DEVICE_TABLE(virtio, id_table); - MODULE_DESCRIPTION("Virtio block driver"); --- -2.34.1 - diff --git a/queue-5.16/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch b/queue-5.16/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch deleted file mode 100644 index b1f5a6efde6..00000000000 --- a/queue-5.16/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 9f5912660f099eb78799c5af7a07dca81837b1d7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:05 -0700 -Subject: netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit fd4213929053bb58b0b2a080ca17f2dd1a9b6df4 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") -Signed-off-by: Randy Dunlap -Acked-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c -index 3e2685c120c7..76a411ae9fe6 100644 ---- a/net/ipv4/netfilter/nf_nat_h323.c -+++ b/net/ipv4/netfilter/nf_nat_h323.c -@@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn callforwarding_nat = { - }; - - /****************************************************************************/ --static int __init init(void) -+static int __init nf_nat_h323_init(void) - { - BUG_ON(set_h245_addr_hook != NULL); - BUG_ON(set_h225_addr_hook != NULL); -@@ -607,7 +607,7 @@ static int __init init(void) - } - - /****************************************************************************/ --static void __exit fini(void) -+static void __exit nf_nat_h323_fini(void) - { - RCU_INIT_POINTER(set_h245_addr_hook, NULL); - RCU_INIT_POINTER(set_h225_addr_hook, NULL); -@@ -624,8 +624,8 @@ static void __exit fini(void) - } - - /****************************************************************************/ --module_init(init); --module_exit(fini); -+module_init(nf_nat_h323_init); -+module_exit(nf_nat_h323_fini); - - MODULE_AUTHOR("Jing Min Zhao "); - MODULE_DESCRIPTION("H.323 NAT helper"); --- -2.34.1 - diff --git a/queue-5.16/series b/queue-5.16/series index e1871b54ee6..72e4f4191a0 100644 --- a/queue-5.16/series +++ b/queue-5.16/series @@ -250,7 +250,6 @@ acpi-apei-fix-return-value-of-__setup-handlers.patch crypto-ccp-ccp_dmaengine_unregister-release-dma-chan.patch crypto-ccree-fix-use-after-free-in-cc_cipher_exit.patch hwrng-nomadik-change-clk_disable-to-clk_disable_unpr.patch -virtio_blk-eliminate-anonymous-module_init-module_ex.patch hwmon-pmbus-add-vin-unit-off-handling.patch clocksource-acpi_pm-fix-return-value-of-__setup-hand.patch io_uring-don-t-check-unrelated-req-open.how-in-accep.patch @@ -612,8 +611,6 @@ mt76-mt7921-fix-mt7921_queues_acq-implementation.patch can-isotp-return-eaddrnotavail-when-reading-from-unb.patch can-isotp-support-msg_trunc-flag-when-reading-from-s.patch bareudp-use-ipv6_mod_enabled-to-check-if-ipv6-enable.patch -usb-usbip-eliminate-anonymous-module_init-module_exi.patch -usb-gadget-eliminate-anonymous-module_init-module_ex.patch ibmvnic-fix-race-between-xmit-and-reset.patch af_unix-fix-some-data-races-around-unix_sk-sk-oob_sk.patch selftests-bpf-fix-error-reporting-from-sock_fields-p.patch @@ -626,7 +623,6 @@ mptcp-fix-crash-due-to-tcp_tsorted_anchor-was-initia.patch af_netlink-fix-shift-out-of-bounds-in-group-mask-cal.patch i2c-meson-fix-wrong-speed-use-from-probe.patch netfilter-conntrack-add-and-use-nf_ct_set_auto_assig.patch -netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch i2c-mux-demux-pinctrl-do-not-deactivate-a-master-tha.patch powerpc-pseries-fix-use-after-free-in-remove_phb_dyn.patch selftests-bpf-test_lirc_mode2.sh-exit-with-proper-co.patch diff --git a/queue-5.16/usb-gadget-eliminate-anonymous-module_init-module_ex.patch b/queue-5.16/usb-gadget-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index 415d9cf082c..00000000000 --- a/queue-5.16/usb-gadget-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 2ad5c3d574b13111e65c363fb99dc4325bdc8b22 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:07 -0700 -Subject: usb: gadget: eliminate anonymous module_init & module_exit -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Randy Dunlap - -[ Upstream commit 6653b827613aa301de691842c38f01e874604f88 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: bd25a14edb75 ("usb: gadget: legacy/serial: allow dynamic removal") -Fixes: 7bb5ea54be47 ("usb gadget serial: use composite gadget framework") -Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") -Signed-off-by: Randy Dunlap -Reviewed-by: Ira Weiny -Cc: Felipe Balbi -Cc: Michał Mirosław -Cc: Sebastian Andrzej Siewior -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-7-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/gadget/legacy/inode.c | 8 ++++---- - drivers/usb/gadget/legacy/serial.c | 10 +++++----- - drivers/usb/gadget/udc/dummy_hcd.c | 8 ++++---- - 3 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c -index 25c8809e0a38..3818296d1aa4 100644 ---- a/drivers/usb/gadget/legacy/inode.c -+++ b/drivers/usb/gadget/legacy/inode.c -@@ -2101,7 +2101,7 @@ MODULE_ALIAS_FS("gadgetfs"); - - /*----------------------------------------------------------------------*/ - --static int __init init (void) -+static int __init gadgetfs_init (void) - { - int status; - -@@ -2111,12 +2111,12 @@ static int __init init (void) - shortname, driver_desc); - return status; - } --module_init (init); -+module_init (gadgetfs_init); - --static void __exit cleanup (void) -+static void __exit gadgetfs_cleanup (void) - { - pr_debug ("unregister %s\n", shortname); - unregister_filesystem (&gadgetfs_type); - } --module_exit (cleanup); -+module_exit (gadgetfs_cleanup); - -diff --git a/drivers/usb/gadget/legacy/serial.c b/drivers/usb/gadget/legacy/serial.c -index da44f89f5e73..dcd3a6603d90 100644 ---- a/drivers/usb/gadget/legacy/serial.c -+++ b/drivers/usb/gadget/legacy/serial.c -@@ -273,7 +273,7 @@ static struct usb_composite_driver gserial_driver = { - static int switch_gserial_enable(bool do_enable) - { - if (!serial_config_driver.label) -- /* init() was not called, yet */ -+ /* gserial_init() was not called, yet */ - return 0; - - if (do_enable) -@@ -283,7 +283,7 @@ static int switch_gserial_enable(bool do_enable) - return 0; - } - --static int __init init(void) -+static int __init gserial_init(void) - { - /* We *could* export two configs; that'd be much cleaner... - * but neither of these product IDs was defined that way. -@@ -314,11 +314,11 @@ static int __init init(void) - - return usb_composite_probe(&gserial_driver); - } --module_init(init); -+module_init(gserial_init); - --static void __exit cleanup(void) -+static void __exit gserial_cleanup(void) - { - if (enable) - usb_composite_unregister(&gserial_driver); - } --module_exit(cleanup); -+module_exit(gserial_cleanup); -diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c -index a2d956af42a2..b8cde6d94e4b 100644 ---- a/drivers/usb/gadget/udc/dummy_hcd.c -+++ b/drivers/usb/gadget/udc/dummy_hcd.c -@@ -2765,7 +2765,7 @@ static struct platform_driver dummy_hcd_driver = { - static struct platform_device *the_udc_pdev[MAX_NUM_UDC]; - static struct platform_device *the_hcd_pdev[MAX_NUM_UDC]; - --static int __init init(void) -+static int __init dummy_hcd_init(void) - { - int retval = -ENOMEM; - int i; -@@ -2887,9 +2887,9 @@ static int __init init(void) - platform_device_put(the_hcd_pdev[i]); - return retval; - } --module_init(init); -+module_init(dummy_hcd_init); - --static void __exit cleanup(void) -+static void __exit dummy_hcd_cleanup(void) - { - int i; - -@@ -2905,4 +2905,4 @@ static void __exit cleanup(void) - platform_driver_unregister(&dummy_udc_driver); - platform_driver_unregister(&dummy_hcd_driver); - } --module_exit(cleanup); -+module_exit(dummy_hcd_cleanup); --- -2.34.1 - diff --git a/queue-5.16/usb-usbip-eliminate-anonymous-module_init-module_exi.patch b/queue-5.16/usb-usbip-eliminate-anonymous-module_init-module_exi.patch deleted file mode 100644 index 1e4d1333a38..00000000000 --- a/queue-5.16/usb-usbip-eliminate-anonymous-module_init-module_exi.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 8a2ad8a28926701681da184e595edf576aa735fc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:08 -0700 -Subject: usb: usbip: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit 393dcd1f2b75e50783c805814a96bf6c8e11fe03 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") -Signed-off-by: Randy Dunlap -Cc: Krzysztof Opasiak -Cc: Igor Kotrasinski -Cc: Valentina Manea -Cc: Shuah Khan -Cc: Shuah Khan -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-8-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/usbip/vudc_main.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/usb/usbip/vudc_main.c b/drivers/usb/usbip/vudc_main.c -index 678faa82598c..1ff277764093 100644 ---- a/drivers/usb/usbip/vudc_main.c -+++ b/drivers/usb/usbip/vudc_main.c -@@ -28,7 +28,7 @@ static struct platform_driver vudc_driver = { - - static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); - --static int __init init(void) -+static int __init vudc_init(void) - { - int retval = -ENOMEM; - int i; -@@ -86,9 +86,9 @@ static int __init init(void) - out: - return retval; - } --module_init(init); -+module_init(vudc_init); - --static void __exit cleanup(void) -+static void __exit vudc_cleanup(void) - { - struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; - -@@ -103,7 +103,7 @@ static void __exit cleanup(void) - } - platform_driver_unregister(&vudc_driver); - } --module_exit(cleanup); -+module_exit(vudc_cleanup); - - MODULE_DESCRIPTION("USB over IP Device Controller"); - MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski"); --- -2.34.1 - diff --git a/queue-5.16/virtio_blk-eliminate-anonymous-module_init-module_ex.patch b/queue-5.16/virtio_blk-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index a5e17d23f5a..00000000000 --- a/queue-5.16/virtio_blk-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,82 +0,0 @@ -From acc2fb44b3a5374cd74c7452098861029782e7c7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:02 -0700 -Subject: virtio_blk: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit bcfe9b6cbb4438b8c1cc4bd475221652c8f9301b ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: e467cde23818 ("Block driver using virtio.") -Signed-off-by: Randy Dunlap -Cc: "Michael S. Tsirkin" -Cc: Jason Wang -Cc: Paolo Bonzini -Cc: Stefan Hajnoczi -Cc: virtualization@lists.linux-foundation.org -Cc: Jens Axboe -Cc: linux-block@vger.kernel.org -Reviewed-by: Stefan Hajnoczi -Acked-by: Jason Wang -Reviewed-by: Ira Weiny -Link: https://lore.kernel.org/r/20220316192010.19001-2-rdunlap@infradead.org -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/block/virtio_blk.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c -index b3df5e5452a7..66b6723beb92 100644 ---- a/drivers/block/virtio_blk.c -+++ b/drivers/block/virtio_blk.c -@@ -1059,7 +1059,7 @@ static struct virtio_driver virtio_blk = { - #endif - }; - --static int __init init(void) -+static int __init virtio_blk_init(void) - { - int error; - -@@ -1085,14 +1085,14 @@ static int __init init(void) - return error; - } - --static void __exit fini(void) -+static void __exit virtio_blk_fini(void) - { - unregister_virtio_driver(&virtio_blk); - unregister_blkdev(major, "virtblk"); - destroy_workqueue(virtblk_wq); - } --module_init(init); --module_exit(fini); -+module_init(virtio_blk_init); -+module_exit(virtio_blk_fini); - - MODULE_DEVICE_TABLE(virtio, id_table); - MODULE_DESCRIPTION("Virtio block driver"); --- -2.34.1 - diff --git a/queue-5.17/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch b/queue-5.17/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch deleted file mode 100644 index 915b9f82551..00000000000 --- a/queue-5.17/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 3788737235123641f298eba52223331cd74ff799 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:05 -0700 -Subject: netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit fd4213929053bb58b0b2a080ca17f2dd1a9b6df4 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") -Signed-off-by: Randy Dunlap -Acked-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c -index 3e2685c120c7..76a411ae9fe6 100644 ---- a/net/ipv4/netfilter/nf_nat_h323.c -+++ b/net/ipv4/netfilter/nf_nat_h323.c -@@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn callforwarding_nat = { - }; - - /****************************************************************************/ --static int __init init(void) -+static int __init nf_nat_h323_init(void) - { - BUG_ON(set_h245_addr_hook != NULL); - BUG_ON(set_h225_addr_hook != NULL); -@@ -607,7 +607,7 @@ static int __init init(void) - } - - /****************************************************************************/ --static void __exit fini(void) -+static void __exit nf_nat_h323_fini(void) - { - RCU_INIT_POINTER(set_h245_addr_hook, NULL); - RCU_INIT_POINTER(set_h225_addr_hook, NULL); -@@ -624,8 +624,8 @@ static void __exit fini(void) - } - - /****************************************************************************/ --module_init(init); --module_exit(fini); -+module_init(nf_nat_h323_init); -+module_exit(nf_nat_h323_fini); - - MODULE_AUTHOR("Jing Min Zhao "); - MODULE_DESCRIPTION("H.323 NAT helper"); --- -2.34.1 - diff --git a/queue-5.17/series b/queue-5.17/series index 76bb8c5503c..8ee97a98d1d 100644 --- a/queue-5.17/series +++ b/queue-5.17/series @@ -260,7 +260,6 @@ crypto-ccree-fix-use-after-free-in-cc_cipher_exit.patch crypto-qat-fix-initialization-of-pfvf-cap_msg-struct.patch crypto-qat-fix-initialization-of-pfvf-rts_map_msg-st.patch hwrng-nomadik-change-clk_disable-to-clk_disable_unpr.patch -virtio_blk-eliminate-anonymous-module_init-module_ex.patch hwmon-pmbus-add-vin-unit-off-handling.patch clocksource-acpi_pm-fix-return-value-of-__setup-hand.patch io_uring-don-t-check-unrelated-req-open.how-in-accep.patch @@ -679,8 +678,6 @@ can-isotp-support-msg_trunc-flag-when-reading-from-s.patch bareudp-use-ipv6_mod_enabled-to-check-if-ipv6-enable.patch pci-imx6-invoke-the-phy-exit-function-after-phy-powe.patch pci-imx6-assert-i.mx8mm-clkreq-even-if-no-device-pre.patch -usb-usbip-eliminate-anonymous-module_init-module_exi.patch -usb-gadget-eliminate-anonymous-module_init-module_ex.patch ibmvnic-fix-race-between-xmit-and-reset.patch af_unix-fix-some-data-races-around-unix_sk-sk-oob_sk.patch selftests-bpf-fix-error-reporting-from-sock_fields-p.patch @@ -693,7 +690,6 @@ mptcp-fix-crash-due-to-tcp_tsorted_anchor-was-initia.patch af_netlink-fix-shift-out-of-bounds-in-group-mask-cal.patch i2c-meson-fix-wrong-speed-use-from-probe.patch netfilter-conntrack-add-and-use-nf_ct_set_auto_assig.patch -netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch i2c-mux-demux-pinctrl-do-not-deactivate-a-master-tha.patch powerpc-pseries-fix-use-after-free-in-remove_phb_dyn.patch ax25-fix-refcount-leaks-caused-by-ax25_cb_del.patch diff --git a/queue-5.17/usb-gadget-eliminate-anonymous-module_init-module_ex.patch b/queue-5.17/usb-gadget-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index c987b50bcab..00000000000 --- a/queue-5.17/usb-gadget-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 532f347a9f9c1d6872cb9d25f84e3af7401bc41a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:07 -0700 -Subject: usb: gadget: eliminate anonymous module_init & module_exit -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Randy Dunlap - -[ Upstream commit 6653b827613aa301de691842c38f01e874604f88 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: bd25a14edb75 ("usb: gadget: legacy/serial: allow dynamic removal") -Fixes: 7bb5ea54be47 ("usb gadget serial: use composite gadget framework") -Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") -Signed-off-by: Randy Dunlap -Reviewed-by: Ira Weiny -Cc: Felipe Balbi -Cc: Michał Mirosław -Cc: Sebastian Andrzej Siewior -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-7-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/gadget/legacy/inode.c | 8 ++++---- - drivers/usb/gadget/legacy/serial.c | 10 +++++----- - drivers/usb/gadget/udc/dummy_hcd.c | 8 ++++---- - 3 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c -index 51f9d96827b1..0c01e749f9ea 100644 ---- a/drivers/usb/gadget/legacy/inode.c -+++ b/drivers/usb/gadget/legacy/inode.c -@@ -2101,7 +2101,7 @@ MODULE_ALIAS_FS("gadgetfs"); - - /*----------------------------------------------------------------------*/ - --static int __init init (void) -+static int __init gadgetfs_init (void) - { - int status; - -@@ -2111,12 +2111,12 @@ static int __init init (void) - shortname, driver_desc); - return status; - } --module_init (init); -+module_init (gadgetfs_init); - --static void __exit cleanup (void) -+static void __exit gadgetfs_cleanup (void) - { - pr_debug ("unregister %s\n", shortname); - unregister_filesystem (&gadgetfs_type); - } --module_exit (cleanup); -+module_exit (gadgetfs_cleanup); - -diff --git a/drivers/usb/gadget/legacy/serial.c b/drivers/usb/gadget/legacy/serial.c -index da44f89f5e73..dcd3a6603d90 100644 ---- a/drivers/usb/gadget/legacy/serial.c -+++ b/drivers/usb/gadget/legacy/serial.c -@@ -273,7 +273,7 @@ static struct usb_composite_driver gserial_driver = { - static int switch_gserial_enable(bool do_enable) - { - if (!serial_config_driver.label) -- /* init() was not called, yet */ -+ /* gserial_init() was not called, yet */ - return 0; - - if (do_enable) -@@ -283,7 +283,7 @@ static int switch_gserial_enable(bool do_enable) - return 0; - } - --static int __init init(void) -+static int __init gserial_init(void) - { - /* We *could* export two configs; that'd be much cleaner... - * but neither of these product IDs was defined that way. -@@ -314,11 +314,11 @@ static int __init init(void) - - return usb_composite_probe(&gserial_driver); - } --module_init(init); -+module_init(gserial_init); - --static void __exit cleanup(void) -+static void __exit gserial_cleanup(void) - { - if (enable) - usb_composite_unregister(&gserial_driver); - } --module_exit(cleanup); -+module_exit(gserial_cleanup); -diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c -index a2d956af42a2..b8cde6d94e4b 100644 ---- a/drivers/usb/gadget/udc/dummy_hcd.c -+++ b/drivers/usb/gadget/udc/dummy_hcd.c -@@ -2765,7 +2765,7 @@ static struct platform_driver dummy_hcd_driver = { - static struct platform_device *the_udc_pdev[MAX_NUM_UDC]; - static struct platform_device *the_hcd_pdev[MAX_NUM_UDC]; - --static int __init init(void) -+static int __init dummy_hcd_init(void) - { - int retval = -ENOMEM; - int i; -@@ -2887,9 +2887,9 @@ static int __init init(void) - platform_device_put(the_hcd_pdev[i]); - return retval; - } --module_init(init); -+module_init(dummy_hcd_init); - --static void __exit cleanup(void) -+static void __exit dummy_hcd_cleanup(void) - { - int i; - -@@ -2905,4 +2905,4 @@ static void __exit cleanup(void) - platform_driver_unregister(&dummy_udc_driver); - platform_driver_unregister(&dummy_hcd_driver); - } --module_exit(cleanup); -+module_exit(dummy_hcd_cleanup); --- -2.34.1 - diff --git a/queue-5.17/usb-usbip-eliminate-anonymous-module_init-module_exi.patch b/queue-5.17/usb-usbip-eliminate-anonymous-module_init-module_exi.patch deleted file mode 100644 index d808ac9c158..00000000000 --- a/queue-5.17/usb-usbip-eliminate-anonymous-module_init-module_exi.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 5ce18ab8db18391fb9fc740e539f941e8106e80d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:08 -0700 -Subject: usb: usbip: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit 393dcd1f2b75e50783c805814a96bf6c8e11fe03 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") -Signed-off-by: Randy Dunlap -Cc: Krzysztof Opasiak -Cc: Igor Kotrasinski -Cc: Valentina Manea -Cc: Shuah Khan -Cc: Shuah Khan -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-8-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/usbip/vudc_main.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/usb/usbip/vudc_main.c b/drivers/usb/usbip/vudc_main.c -index 678faa82598c..1ff277764093 100644 ---- a/drivers/usb/usbip/vudc_main.c -+++ b/drivers/usb/usbip/vudc_main.c -@@ -28,7 +28,7 @@ static struct platform_driver vudc_driver = { - - static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); - --static int __init init(void) -+static int __init vudc_init(void) - { - int retval = -ENOMEM; - int i; -@@ -86,9 +86,9 @@ static int __init init(void) - out: - return retval; - } --module_init(init); -+module_init(vudc_init); - --static void __exit cleanup(void) -+static void __exit vudc_cleanup(void) - { - struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; - -@@ -103,7 +103,7 @@ static void __exit cleanup(void) - } - platform_driver_unregister(&vudc_driver); - } --module_exit(cleanup); -+module_exit(vudc_cleanup); - - MODULE_DESCRIPTION("USB over IP Device Controller"); - MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski"); --- -2.34.1 - diff --git a/queue-5.17/virtio_blk-eliminate-anonymous-module_init-module_ex.patch b/queue-5.17/virtio_blk-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index 723c7b1087d..00000000000 --- a/queue-5.17/virtio_blk-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0c0434a33667dbfedceb984ade0e7e3faeb4bfae Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:02 -0700 -Subject: virtio_blk: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit bcfe9b6cbb4438b8c1cc4bd475221652c8f9301b ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: e467cde23818 ("Block driver using virtio.") -Signed-off-by: Randy Dunlap -Cc: "Michael S. Tsirkin" -Cc: Jason Wang -Cc: Paolo Bonzini -Cc: Stefan Hajnoczi -Cc: virtualization@lists.linux-foundation.org -Cc: Jens Axboe -Cc: linux-block@vger.kernel.org -Reviewed-by: Stefan Hajnoczi -Acked-by: Jason Wang -Reviewed-by: Ira Weiny -Link: https://lore.kernel.org/r/20220316192010.19001-2-rdunlap@infradead.org -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/block/virtio_blk.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c -index 8c415be86732..bf926426950d 100644 ---- a/drivers/block/virtio_blk.c -+++ b/drivers/block/virtio_blk.c -@@ -1058,7 +1058,7 @@ static struct virtio_driver virtio_blk = { - #endif - }; - --static int __init init(void) -+static int __init virtio_blk_init(void) - { - int error; - -@@ -1084,14 +1084,14 @@ static int __init init(void) - return error; - } - --static void __exit fini(void) -+static void __exit virtio_blk_fini(void) - { - unregister_virtio_driver(&virtio_blk); - unregister_blkdev(major, "virtblk"); - destroy_workqueue(virtblk_wq); - } --module_init(init); --module_exit(fini); -+module_init(virtio_blk_init); -+module_exit(virtio_blk_fini); - - MODULE_DEVICE_TABLE(virtio, id_table); - MODULE_DESCRIPTION("Virtio block driver"); --- -2.34.1 - diff --git a/queue-5.4/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch b/queue-5.4/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch deleted file mode 100644 index edd3b28c32b..00000000000 --- a/queue-5.4/netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 72d5caebebd63eacf70a08467db758aaba6136ac Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:05 -0700 -Subject: netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit fd4213929053bb58b0b2a080ca17f2dd1a9b6df4 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") -Signed-off-by: Randy Dunlap -Acked-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c -index 3e2685c120c7..76a411ae9fe6 100644 ---- a/net/ipv4/netfilter/nf_nat_h323.c -+++ b/net/ipv4/netfilter/nf_nat_h323.c -@@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn callforwarding_nat = { - }; - - /****************************************************************************/ --static int __init init(void) -+static int __init nf_nat_h323_init(void) - { - BUG_ON(set_h245_addr_hook != NULL); - BUG_ON(set_h225_addr_hook != NULL); -@@ -607,7 +607,7 @@ static int __init init(void) - } - - /****************************************************************************/ --static void __exit fini(void) -+static void __exit nf_nat_h323_fini(void) - { - RCU_INIT_POINTER(set_h245_addr_hook, NULL); - RCU_INIT_POINTER(set_h225_addr_hook, NULL); -@@ -624,8 +624,8 @@ static void __exit fini(void) - } - - /****************************************************************************/ --module_init(init); --module_exit(fini); -+module_init(nf_nat_h323_init); -+module_exit(nf_nat_h323_fini); - - MODULE_AUTHOR("Jing Min Zhao "); - MODULE_DESCRIPTION("H.323 NAT helper"); --- -2.34.1 - diff --git a/queue-5.4/series b/queue-5.4/series index daa9076e057..f2f03164d79 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -103,7 +103,6 @@ crypto-vmx-add-missing-dependencies.patch clocksource-drivers-timer-of-check-return-value-of-o.patch acpi-apei-fix-return-value-of-__setup-handlers.patch crypto-ccp-ccp_dmaengine_unregister-release-dma-chan.patch -virtio_blk-eliminate-anonymous-module_init-module_ex.patch hwmon-pmbus-add-vin-unit-off-handling.patch clocksource-acpi_pm-fix-return-value-of-__setup-hand.patch sched-debug-remove-mpol_get-put-and-task_lock-unlock.patch @@ -217,10 +216,8 @@ bpf-sockmap-fix-memleak-in-tcp_bpf_sendmsg-while-sk-.patch bpf-sockmap-fix-more-uncharged-while-msg-has-more_da.patch bpf-sockmap-fix-double-uncharge-the-mem-of-sk_msg.patch usb-storage-ums-realtek-fix-error-code-in-rts51x_rea.patch -usb-usbip-eliminate-anonymous-module_init-module_exi.patch bluetooth-btmtksdio-fix-kernel-oops-in-btmtksdio_int.patch af_netlink-fix-shift-out-of-bounds-in-group-mask-cal.patch -netfilter-nf_nat_h323-eliminate-anonymous-module_ini.patch i2c-mux-demux-pinctrl-do-not-deactivate-a-master-tha.patch selftests-bpf-test_lirc_mode2.sh-exit-with-proper-co.patch net-bcmgenet-use-stronger-register-read-writes-to-as.patch diff --git a/queue-5.4/usb-usbip-eliminate-anonymous-module_init-module_exi.patch b/queue-5.4/usb-usbip-eliminate-anonymous-module_init-module_exi.patch deleted file mode 100644 index 07fdd974333..00000000000 --- a/queue-5.4/usb-usbip-eliminate-anonymous-module_init-module_exi.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 2ce030a6c6c9bafc05fa95ae366125e9c9db41b9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:08 -0700 -Subject: usb: usbip: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit 393dcd1f2b75e50783c805814a96bf6c8e11fe03 ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") -Signed-off-by: Randy Dunlap -Cc: Krzysztof Opasiak -Cc: Igor Kotrasinski -Cc: Valentina Manea -Cc: Shuah Khan -Cc: Shuah Khan -Cc: linux-usb@vger.kernel.org -Link: https://lore.kernel.org/r/20220316192010.19001-8-rdunlap@infradead.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/usb/usbip/vudc_main.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/usb/usbip/vudc_main.c b/drivers/usb/usbip/vudc_main.c -index 678faa82598c..1ff277764093 100644 ---- a/drivers/usb/usbip/vudc_main.c -+++ b/drivers/usb/usbip/vudc_main.c -@@ -28,7 +28,7 @@ static struct platform_driver vudc_driver = { - - static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); - --static int __init init(void) -+static int __init vudc_init(void) - { - int retval = -ENOMEM; - int i; -@@ -86,9 +86,9 @@ static int __init init(void) - out: - return retval; - } --module_init(init); -+module_init(vudc_init); - --static void __exit cleanup(void) -+static void __exit vudc_cleanup(void) - { - struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; - -@@ -103,7 +103,7 @@ static void __exit cleanup(void) - } - platform_driver_unregister(&vudc_driver); - } --module_exit(cleanup); -+module_exit(vudc_cleanup); - - MODULE_DESCRIPTION("USB over IP Device Controller"); - MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski"); --- -2.34.1 - diff --git a/queue-5.4/virtio_blk-eliminate-anonymous-module_init-module_ex.patch b/queue-5.4/virtio_blk-eliminate-anonymous-module_init-module_ex.patch deleted file mode 100644 index ed2ad6b8bdf..00000000000 --- a/queue-5.4/virtio_blk-eliminate-anonymous-module_init-module_ex.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 17987cbb9cdd58a6509a14b3906c48ba9894b05a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Mar 2022 12:20:02 -0700 -Subject: virtio_blk: eliminate anonymous module_init & module_exit - -From: Randy Dunlap - -[ Upstream commit bcfe9b6cbb4438b8c1cc4bd475221652c8f9301b ] - -Eliminate anonymous module_init() and module_exit(), which can lead to -confusion or ambiguity when reading System.map, crashes/oops/bugs, -or an initcall_debug log. - -Give each of these init and exit functions unique driver-specific -names to eliminate the anonymous names. - -Example 1: (System.map) - ffffffff832fc78c t init - ffffffff832fc79e t init - ffffffff832fc8f8 t init - -Example 2: (initcall_debug log) - calling init+0x0/0x12 @ 1 - initcall init+0x0/0x12 returned 0 after 15 usecs - calling init+0x0/0x60 @ 1 - initcall init+0x0/0x60 returned 0 after 2 usecs - calling init+0x0/0x9a @ 1 - initcall init+0x0/0x9a returned 0 after 74 usecs - -Fixes: e467cde23818 ("Block driver using virtio.") -Signed-off-by: Randy Dunlap -Cc: "Michael S. Tsirkin" -Cc: Jason Wang -Cc: Paolo Bonzini -Cc: Stefan Hajnoczi -Cc: virtualization@lists.linux-foundation.org -Cc: Jens Axboe -Cc: linux-block@vger.kernel.org -Reviewed-by: Stefan Hajnoczi -Acked-by: Jason Wang -Reviewed-by: Ira Weiny -Link: https://lore.kernel.org/r/20220316192010.19001-2-rdunlap@infradead.org -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/block/virtio_blk.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c -index 2a5cd502feae..c3a9808a2ffb 100644 ---- a/drivers/block/virtio_blk.c -+++ b/drivers/block/virtio_blk.c -@@ -1131,7 +1131,7 @@ static struct virtio_driver virtio_blk = { - #endif - }; - --static int __init init(void) -+static int __init virtio_blk_init(void) - { - int error; - -@@ -1157,14 +1157,14 @@ static int __init init(void) - return error; - } - --static void __exit fini(void) -+static void __exit virtio_blk_fini(void) - { - unregister_virtio_driver(&virtio_blk); - unregister_blkdev(major, "virtblk"); - destroy_workqueue(virtblk_wq); - } --module_init(init); --module_exit(fini); -+module_init(virtio_blk_init); -+module_exit(virtio_blk_fini); - - MODULE_DEVICE_TABLE(virtio, id_table); - MODULE_DESCRIPTION("Virtio block driver"); --- -2.34.1 - -- 2.47.3