dtrace: remove cleanup_module support

There is no need anymore for providers to call a cleanup_module
function in provider modules.  The functionality that this function
provided is being rewritten.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>

diff --git a/dtrace/dt_perf_mod.c b/dtrace/dt_perf_mod.c
index 9cc1b96ee69044c7edafe9397e0a06a5a3128387..1fd67d812f4c816c9f21cc24578b29be3f0a6c48 100644 (file)
--- a/dtrace/dt_perf_mod.c
+++ b/dtrace/dt_perf_mod.c
@@ -49,7 +49,6 @@ DT_PROVIDER_POPS(dt_perf)
 static dtrace_pops_t dt_perf_pops = {
        dt_perf_provide,
        NULL,
-       NULL,
        dt_perf_enable,
        dt_perf_disable,
        NULL,

diff --git a/dtrace/dt_test_mod.c b/dtrace/dt_test_mod.c
index 143519ab8be9f0539404b04c45187a09ad7aa9b2..b7e059bd57eaded447e575e2f46d010c023dddf9 100644 (file)
--- a/dtrace/dt_test_mod.c
+++ b/dtrace/dt_test_mod.c
@@ -49,7 +49,6 @@ DT_PROVIDER_POPS(dt_test)
 static dtrace_pops_t dt_test_pops = {
        dt_test_provide,
        NULL,
-       NULL,
        dt_test_enable,
        dt_test_disable,
        NULL,

diff --git a/dtrace/dtrace_dev.c b/dtrace/dtrace_dev.c
index cce388c389e0679044fd365a4372b68043f8e9c1..4e08146519a50713a7d4b29ebb53a8d9fe829660 100644 (file)
--- a/dtrace/dtrace_dev.c
+++ b/dtrace/dtrace_dev.c
@@ -51,7 +51,6 @@ int                           dtrace_err_verbose;
 dtrace_pops_t                  dtrace_provider_ops = {
        (void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop,
        (void (*)(void *, struct module *))dtrace_nullop,
-       (void (*)(void *, struct module *))dtrace_nullop,
        (int (*)(void *, dtrace_id_t, void *))dtrace_enable_nullop,
        (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
        (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
@@ -1258,15 +1257,6 @@ static void dtrace_module_unloaded(struct module *mp)
                kfree(probe);
        }
 
-
-       /*
-        * Give all providers a chance to do cleanup for this module.
-        */
-       for (prv = dtrace_provider; prv != NULL; prv = prv->dtpv_next) {
-               if (prv->dtpv_pops.dtps_cleanup_module)
-                       prv->dtpv_pops.dtps_cleanup_module(prv->dtpv_arg, mp);
-       }
-
        mutex_unlock(&dtrace_lock);
        mutex_unlock(&dtrace_provider_lock);
 

diff --git a/dtrace/fasttrap_dev.c b/dtrace/fasttrap_dev.c
index 6e92974c0f33655baf60963690538de0c3978954..e5fafcde9e7c5e06493c4f46be288dcd47feadc5 100644 (file)
--- a/dtrace/fasttrap_dev.c
+++ b/dtrace/fasttrap_dev.c
@@ -723,7 +723,6 @@ static dtrace_pops_t pid_pops = {
 static dtrace_pops_t usdt_pops = {
        fasttrap_pid_provide,
        NULL,
-       NULL,
        fasttrap_pid_enable,
        fasttrap_pid_disable,
        NULL,

diff --git a/dtrace/include/dtrace/provider.h b/dtrace/include/dtrace/provider.h
index 1811658a279e8d59bef5121f2506dd20db8ec43e..c5a3a4f252d62e1d8bcb94329f888f7b6a1ba2da 100644 (file)
--- a/dtrace/include/dtrace/provider.h
+++ b/dtrace/include/dtrace/provider.h
@@ -707,7 +707,6 @@
 typedef struct dtrace_pops {
        void (*dtps_provide)(void *, const struct dtrace_probedesc *);
        void (*dtps_provide_module)(void *, struct module *);
-       void (*dtps_cleanup_module)(void *, struct module *);
        int (*dtps_enable)(void *, dtrace_id_t, void *);
        void (*dtps_disable)(void *, dtrace_id_t, void *);
        void (*dtps_suspend)(void *, dtrace_id_t, void *);

diff --git a/dtrace/profile_mod.c b/dtrace/profile_mod.c
index 17ea344054244a4ebfc4e72a1711ccb716f16c8f..e3cc2b16b449f153f0e15ba2862c7ccf8ad444ea 100644 (file)
--- a/dtrace/profile_mod.c
+++ b/dtrace/profile_mod.c
@@ -49,7 +49,6 @@ DT_PROVIDER_POPS(profile)
 static dtrace_pops_t profile_pops = {
        profile_provide,
        NULL,
-       NULL,
        profile_enable,
        profile_disable,
        NULL,

diff --git a/dtrace/sdt_mod.c b/dtrace/sdt_mod.c
index 29dd49eed436bdd13e0b3f749ae6bb026d4b3a95..8f24a7ec86d22b86f1ceb41416e7f33e78ae8ccf 100644 (file)
--- a/dtrace/sdt_mod.c
+++ b/dtrace/sdt_mod.c
@@ -122,11 +122,6 @@ DT_PROVIDER_POPS(sdt)
 static dtrace_pops_t sdt_pops = {
        NULL,
        sdt_provide_module,
-#ifdef CONFIG_SPARC64
-       sdt_cleanup_module,
-#else
-       NULL,
-#endif
        sdt_enable,
        sdt_disable,
        NULL,

diff --git a/dtrace/systrace_mod.c b/dtrace/systrace_mod.c
index 87b7fe037b8138e3c4ba445417a699f35fad1dcd..3f89f8ea2f59b6bd26d1a41db3a0d96bda800982 100644 (file)
--- a/dtrace/systrace_mod.c
+++ b/dtrace/systrace_mod.c
@@ -49,7 +49,6 @@ DT_PROVIDER_POPS(systrace)
 static dtrace_pops_t syscall_pops = {
        systrace_provide,
        NULL,
-       NULL,
        systrace_enable,
        systrace_disable,
        NULL,