kallsyms: Delete an unused parameter related to {module_}kallsyms_on_each_symbol()

The parameter 'struct module *' in the hook function associated with
{module_}kallsyms_on_each_symbol() is no longer used. Delete it.

Suggested-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 0065209cc00424b3eda2ac7da96b2499e4852395..fe3c9993b5bfe47db50143f20ad25c69d1cb888c 100644 (file)
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -67,8 +67,7 @@ static inline void *dereference_symbol_descriptor(void *ptr)
 
 #ifdef CONFIG_KALLSYMS
 unsigned long kallsyms_sym_address(int idx);
-int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,
-                                     unsigned long),
+int kallsyms_on_each_symbol(int (*fn)(void *, const char *, unsigned long),
                            void *data);
 int kallsyms_on_each_match_symbol(int (*fn)(void *, unsigned long),
                                  const char *name, void *data);
@@ -166,8 +165,8 @@ static inline bool kallsyms_show_value(const struct cred *cred)
        return false;
 }
 
-static inline int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,
-                                         unsigned long), void *data)
+static inline int kallsyms_on_each_symbol(int (*fn)(void *, const char *, unsigned long),
+                                         void *data)
 {
        return -EOPNOTSUPP;
 }

diff --git a/include/linux/module.h b/include/linux/module.h
index c3b35719647019111fbfe928f752bb63f78bbcbe..d2d900077bde8e19789da60868494291760741d6 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -965,13 +965,11 @@ static inline bool module_sig_ok(struct module *module)
 
 #if defined(CONFIG_MODULES) && defined(CONFIG_KALLSYMS)
 int module_kallsyms_on_each_symbol(const char *modname,
-                                  int (*fn)(void *, const char *,
-                                            struct module *, unsigned long),
+                                  int (*fn)(void *, const char *, unsigned long),
                                   void *data);
 #else
 static inline int module_kallsyms_on_each_symbol(const char *modname,
-                                                int (*fn)(void *, const char *,
-                                                struct module *, unsigned long),
+                                                int (*fn)(void *, const char *, unsigned long),
                                                 void *data)
 {
        return -EOPNOTSUPP;

diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index 83f499182c9aa319c2f56300754ac6fbfe1bc0b0..77747391f49b66cbdefd6b58cfce4e5d3f54b18f 100644 (file)
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -288,8 +288,7 @@ unsigned long kallsyms_lookup_name(const char *name)
  * Iterate over all symbols in vmlinux.  For symbols from modules use
  * module_kallsyms_on_each_symbol instead.
  */
-int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,
-                                     unsigned long),
+int kallsyms_on_each_symbol(int (*fn)(void *, const char *, unsigned long),
                            void *data)
 {
        char namebuf[KSYM_NAME_LEN];
@@ -299,7 +298,7 @@ int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,
 
        for (i = 0, off = 0; i < kallsyms_num_syms; i++) {
                off = kallsyms_expand_symbol(off, namebuf, ARRAY_SIZE(namebuf));
-               ret = fn(data, namebuf, NULL, kallsyms_sym_address(i));
+               ret = fn(data, namebuf, kallsyms_sym_address(i));
                if (ret != 0)
                        return ret;
                cond_resched();

diff --git a/kernel/kallsyms_selftest.c b/kernel/kallsyms_selftest.c
index bfbc12da33267f827112009da05bf44ae86e6ba4..a2e3745d15c471ffb6809475f4f16a4fe68e3504 100644 (file)
--- a/kernel/kallsyms_selftest.c
+++ b/kernel/kallsyms_selftest.c
@@ -95,7 +95,7 @@ static struct test_item test_items[] = {
 
 static char stub_name[KSYM_NAME_LEN];
 
-static int stat_symbol_len(void *data, const char *name, struct module *mod, unsigned long addr)
+static int stat_symbol_len(void *data, const char *name, unsigned long addr)
 {
        *(u32 *)data += strlen(name);
 
@@ -154,7 +154,7 @@ static void test_kallsyms_compression_ratio(void)
        pr_info(" ---------------------------------------------------------\n");
 }
 
-static int lookup_name(void *data, const char *name, struct module *mod, unsigned long addr)
+static int lookup_name(void *data, const char *name, unsigned long addr)
 {
        u64 t0, t1, t;
        struct test_stat *stat = (struct test_stat *)data;
@@ -207,7 +207,7 @@ static bool match_cleanup_name(const char *s, const char *name)
        return !strncmp(s, name, len);
 }
 
-static int find_symbol(void *data, const char *name, struct module *mod, unsigned long addr)
+static int find_symbol(void *data, const char *name, unsigned long addr)
 {
        struct test_stat *stat = (struct test_stat *)data;
 

diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index 4bd2d5e10f20a1c83a24a829e8f29b55dd32e506..1de2c40cc37841a6a506467dd9b96725e6b81f8b 100644 (file)
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -142,8 +142,7 @@ static int klp_match_callback(void *data, unsigned long addr)
        return 0;
 }
 
-static int klp_find_callback(void *data, const char *name,
-                            struct module *mod, unsigned long addr)
+static int klp_find_callback(void *data, const char *name, unsigned long addr)
 {
        struct klp_find_arg *args = data;
 

diff --git a/kernel/module/kallsyms.c b/kernel/module/kallsyms.c
index 8e89f459ffddedb824141988b04fbde0756f5f39..3320586584f10fbe4c7649f8521bc74c48e8f243 100644 (file)
--- a/kernel/module/kallsyms.c
+++ b/kernel/module/kallsyms.c
@@ -503,8 +503,7 @@ unsigned long module_kallsyms_lookup_name(const char *name)
 }
 
 int module_kallsyms_on_each_symbol(const char *modname,
-                                  int (*fn)(void *, const char *,
-                                            struct module *, unsigned long),
+                                  int (*fn)(void *, const char *, unsigned long),
                                   void *data)
 {
        struct module *mod;
@@ -533,7 +532,7 @@ int module_kallsyms_on_each_symbol(const char *modname,
                                continue;
 
                        ret = fn(data, kallsyms_symbol_name(kallsyms, i),
-                                mod, kallsyms_symbol_value(sym));
+                                kallsyms_symbol_value(sym));
                        if (ret != 0)
                                goto out;
                }

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 29baa97d0d534284237a4376dda1d88aca6f7c06..76caca8f496aaedfe741a32e0d0a1e681175f27d 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -8391,8 +8391,7 @@ struct kallsyms_data {
  * and returns 1 in case we resolved all the requested symbols,
  * 0 otherwise.
  */
-static int kallsyms_callback(void *data, const char *name,
-                            struct module *mod, unsigned long addr)
+static int kallsyms_callback(void *data, const char *name, unsigned long addr)
 {
        struct kallsyms_data *args = data;
        const char **sym;