Merge branch 'osd-devel' into nfs-for-next

1 files changed, 0 insertions, 47 deletions

diff --git a/kernel/module.c b/kernel/module.c
index 04379f92f843..93342d992f34 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3487,50 +3487,3 @@ void module_layout(struct module *mod,
 }
 EXPORT_SYMBOL(module_layout);
 #endif
-
-#ifdef CONFIG_TRACEPOINTS
-void module_update_tracepoints(void)
-{
-        struct module *mod;
-
-        mutex_lock(&module_mutex);
-        list_for_each_entry(mod, &modules, list)
-                if (!mod->taints)
-                        tracepoint_update_probe_range(mod->tracepoints_ptrs,
-                                mod->tracepoints_ptrs + mod->num_tracepoints);
-        mutex_unlock(&module_mutex);
-}
-
-/*
- * Returns 0 if current not found.
- * Returns 1 if current found.
- */
-int module_get_iter_tracepoints(struct tracepoint_iter *iter)
-{
-        struct module *iter_mod;
-        int found = 0;
-
-        mutex_lock(&module_mutex);
-        list_for_each_entry(iter_mod, &modules, list) {
-                if (!iter_mod->taints) {
-                        /*
-                         * Sorted module list
-                         */
-                        if (iter_mod < iter->module)
-                                continue;
-                        else if (iter_mod > iter->module)
-                                iter->tracepoint = NULL;
-                        found = tracepoint_get_iter_range(&iter->tracepoint,
-                                iter_mod->tracepoints_ptrs,
-                                iter_mod->tracepoints_ptrs
-                                        + iter_mod->num_tracepoints);
-                        if (found) {
-                                iter->module = iter_mod;
-                                break;
-                        }
-                }
-        }
-        mutex_unlock(&module_mutex);
-        return found;
-}
-#endif