drop rv-monitor-add-__init-__exit-annotations-to-module-i.patch

diff --git a/queue-6.0/rv-monitor-add-__init-__exit-annotations-to-module-i.patch b/queue-6.0/rv-monitor-add-__init-__exit-annotations-to-module-i.patch
deleted file mode 100644 (file)
index 5256a4a..0000000
--- a/queue-6.0/rv-monitor-add-__init-__exit-annotations-to-module-i.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From c88269924fc3dfa0317019b48fb96586bbf2a351 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 22 Sep 2022 18:32:08 +0800
-Subject: rv/monitor: Add __init/__exit annotations to module init/exit funcs
-
-From: Xiu Jianfeng <xiujianfeng@huawei.com>
-
-[ Upstream commit 834168fb2ce57681dee86a405ec560f54417830c ]
-
-Add missing __init/__exit annotations to module init/exit funcs.
-
-Link: https://lkml.kernel.org/r/20220922103208.162869-1-xiujianfeng@huawei.com
-
-Fixes: 24bce201d798 ("tools/rv: Add dot2k")
-Fixes: 8812d21219b9 ("rv/monitor: Add the wip monitor skeleton created by dot2k")
-Fixes: ccc319dcb450 ("rv/monitor: Add the wwnr monitor")
-Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
-Acked-by: Daniel Bristot de Oliveira <bristot@kernel.org>
-Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/trace/rv/monitors/wip/wip.c                      | 4 ++--
- kernel/trace/rv/monitors/wwnr/wwnr.c                    | 4 ++--
- tools/verification/dot2/dot2k_templates/main_global.c   | 4 ++--
- tools/verification/dot2/dot2k_templates/main_per_cpu.c  | 4 ++--
- tools/verification/dot2/dot2k_templates/main_per_task.c | 4 ++--
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/kernel/trace/rv/monitors/wip/wip.c b/kernel/trace/rv/monitors/wip/wip.c
-index 83cace53b9fa..6be876e2f405 100644
---- a/kernel/trace/rv/monitors/wip/wip.c
-+++ b/kernel/trace/rv/monitors/wip/wip.c
-@@ -69,13 +69,13 @@ struct rv_monitor rv_wip = {
-       .enabled = 0,
- };
- 
--static int register_wip(void)
-+static int __init register_wip(void)
- {
-       rv_register_monitor(&rv_wip);
-       return 0;
- }
- 
--static void unregister_wip(void)
-+static void __exit unregister_wip(void)
- {
-       rv_unregister_monitor(&rv_wip);
- }
-diff --git a/kernel/trace/rv/monitors/wwnr/wwnr.c b/kernel/trace/rv/monitors/wwnr/wwnr.c
-index 599225d9cf38..c1fac4808b02 100644
---- a/kernel/trace/rv/monitors/wwnr/wwnr.c
-+++ b/kernel/trace/rv/monitors/wwnr/wwnr.c
-@@ -68,13 +68,13 @@ struct rv_monitor rv_wwnr = {
-       .enabled = 0,
- };
- 
--static int register_wwnr(void)
-+static int __init register_wwnr(void)
- {
-       rv_register_monitor(&rv_wwnr);
-       return 0;
- }
- 
--static void unregister_wwnr(void)
-+static void __exit unregister_wwnr(void)
- {
-       rv_unregister_monitor(&rv_wwnr);
- }
-diff --git a/tools/verification/dot2/dot2k_templates/main_global.c b/tools/verification/dot2/dot2k_templates/main_global.c
-index f4b712dbc92e..45fc6709701b 100644
---- a/tools/verification/dot2/dot2k_templates/main_global.c
-+++ b/tools/verification/dot2/dot2k_templates/main_global.c
-@@ -72,13 +72,13 @@ struct rv_monitor rv_MODEL_NAME = {
-       .enabled = 0,
- };
- 
--static int register_MODEL_NAME(void)
-+static int __init register_MODEL_NAME(void)
- {
-       rv_register_monitor(&rv_MODEL_NAME);
-       return 0;
- }
- 
--static void unregister_MODEL_NAME(void)
-+static void __exit unregister_MODEL_NAME(void)
- {
-       rv_unregister_monitor(&rv_MODEL_NAME);
- }
-diff --git a/tools/verification/dot2/dot2k_templates/main_per_cpu.c b/tools/verification/dot2/dot2k_templates/main_per_cpu.c
-index 4080d1ca3354..9014c9ef657b 100644
---- a/tools/verification/dot2/dot2k_templates/main_per_cpu.c
-+++ b/tools/verification/dot2/dot2k_templates/main_per_cpu.c
-@@ -72,13 +72,13 @@ struct rv_monitor rv_MODEL_NAME = {
-       .enabled = 0,
- };
- 
--static int register_MODEL_NAME(void)
-+static int __init register_MODEL_NAME(void)
- {
-       rv_register_monitor(&rv_MODEL_NAME);
-       return 0;
- }
- 
--static void unregister_MODEL_NAME(void)
-+static void __exit unregister_MODEL_NAME(void)
- {
-       rv_unregister_monitor(&rv_MODEL_NAME);
- }
-diff --git a/tools/verification/dot2/dot2k_templates/main_per_task.c b/tools/verification/dot2/dot2k_templates/main_per_task.c
-index 89197175384f..13d11620d19f 100644
---- a/tools/verification/dot2/dot2k_templates/main_per_task.c
-+++ b/tools/verification/dot2/dot2k_templates/main_per_task.c
-@@ -72,13 +72,13 @@ struct rv_monitor rv_MODEL_NAME = {
-       .enabled = 0,
- };
- 
--static int register_MODEL_NAME(void)
-+static int __init register_MODEL_NAME(void)
- {
-       rv_register_monitor(&rv_MODEL_NAME);
-       return 0;
- }
- 
--static void unregister_MODEL_NAME(void)
-+static void __exit unregister_MODEL_NAME(void)
- {
-       rv_unregister_monitor(&rv_MODEL_NAME);
- }
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 3cbfe05400b753a18f9ea780ddfb5b5a61f6cee7..fc5f492c12eae5e9d4cba16359823b5b41c098bb 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -670,7 +670,6 @@ iommu-iova-fix-module-config-properly.patch
 tracing-kprobe-fix-kprobe-event-gen-test-module-on-e.patch
 tracing-kprobe-make-gen-test-module-work-in-arm-and-.patch
 tracing-osnoise-fix-possible-recursive-locking-in-st.patch
-rv-monitor-add-__init-__exit-annotations-to-module-i.patch
 ftrace-fix-recursive-locking-direct_mutex-in-ftrace_.patch
 kbuild-remove-the-target-in-signal-traps-when-interr.patch
 linux-export-use-inline-assembler-to-populate-symbol.patch