Commit 3703bd54 authored by Zhen Lei's avatar Zhen Lei Committed by Luis Chamberlain

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: default avatarPetr Mladek <pmladek@suse.com>
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: default avatarVincenzo Palazzo <vincenzopalazzodev@gmail.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 7ce93729
...@@ -67,8 +67,7 @@ static inline void *dereference_symbol_descriptor(void *ptr) ...@@ -67,8 +67,7 @@ static inline void *dereference_symbol_descriptor(void *ptr)
#ifdef CONFIG_KALLSYMS #ifdef CONFIG_KALLSYMS
unsigned long kallsyms_sym_address(int idx); unsigned long kallsyms_sym_address(int idx);
int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, int kallsyms_on_each_symbol(int (*fn)(void *, const char *, unsigned long),
unsigned long),
void *data); void *data);
int kallsyms_on_each_match_symbol(int (*fn)(void *, unsigned long), int kallsyms_on_each_match_symbol(int (*fn)(void *, unsigned long),
const char *name, void *data); const char *name, void *data);
...@@ -166,8 +165,8 @@ static inline bool kallsyms_show_value(const struct cred *cred) ...@@ -166,8 +165,8 @@ static inline bool kallsyms_show_value(const struct cred *cred)
return false; return false;
} }
static inline int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, static inline int kallsyms_on_each_symbol(int (*fn)(void *, const char *, unsigned long),
unsigned long), void *data) void *data)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
......
...@@ -965,13 +965,11 @@ static inline bool module_sig_ok(struct module *module) ...@@ -965,13 +965,11 @@ static inline bool module_sig_ok(struct module *module)
#if defined(CONFIG_MODULES) && defined(CONFIG_KALLSYMS) #if defined(CONFIG_MODULES) && defined(CONFIG_KALLSYMS)
int module_kallsyms_on_each_symbol(const char *modname, int module_kallsyms_on_each_symbol(const char *modname,
int (*fn)(void *, const char *, int (*fn)(void *, const char *, unsigned long),
struct module *, unsigned long),
void *data); void *data);
#else #else
static inline int module_kallsyms_on_each_symbol(const char *modname, static inline int module_kallsyms_on_each_symbol(const char *modname,
int (*fn)(void *, const char *, int (*fn)(void *, const char *, unsigned long),
struct module *, unsigned long),
void *data) void *data)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
......
...@@ -288,8 +288,7 @@ unsigned long kallsyms_lookup_name(const char *name) ...@@ -288,8 +288,7 @@ unsigned long kallsyms_lookup_name(const char *name)
* Iterate over all symbols in vmlinux. For symbols from modules use * Iterate over all symbols in vmlinux. For symbols from modules use
* module_kallsyms_on_each_symbol instead. * module_kallsyms_on_each_symbol instead.
*/ */
int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, int kallsyms_on_each_symbol(int (*fn)(void *, const char *, unsigned long),
unsigned long),
void *data) void *data)
{ {
char namebuf[KSYM_NAME_LEN]; char namebuf[KSYM_NAME_LEN];
...@@ -299,7 +298,7 @@ int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, ...@@ -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++) { for (i = 0, off = 0; i < kallsyms_num_syms; i++) {
off = kallsyms_expand_symbol(off, namebuf, ARRAY_SIZE(namebuf)); 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) if (ret != 0)
return ret; return ret;
cond_resched(); cond_resched();
......
...@@ -95,7 +95,7 @@ static struct test_item test_items[] = { ...@@ -95,7 +95,7 @@ static struct test_item test_items[] = {
static char stub_name[KSYM_NAME_LEN]; 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); *(u32 *)data += strlen(name);
...@@ -154,7 +154,7 @@ static void test_kallsyms_compression_ratio(void) ...@@ -154,7 +154,7 @@ static void test_kallsyms_compression_ratio(void)
pr_info(" ---------------------------------------------------------\n"); 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; u64 t0, t1, t;
struct test_stat *stat = (struct test_stat *)data; struct test_stat *stat = (struct test_stat *)data;
...@@ -207,7 +207,7 @@ static bool match_cleanup_name(const char *s, const char *name) ...@@ -207,7 +207,7 @@ static bool match_cleanup_name(const char *s, const char *name)
return !strncmp(s, name, len); 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; struct test_stat *stat = (struct test_stat *)data;
......
...@@ -142,8 +142,7 @@ static int klp_match_callback(void *data, unsigned long addr) ...@@ -142,8 +142,7 @@ static int klp_match_callback(void *data, unsigned long addr)
return 0; return 0;
} }
static int klp_find_callback(void *data, const char *name, static int klp_find_callback(void *data, const char *name, unsigned long addr)
struct module *mod, unsigned long addr)
{ {
struct klp_find_arg *args = data; struct klp_find_arg *args = data;
......
...@@ -503,8 +503,7 @@ unsigned long module_kallsyms_lookup_name(const char *name) ...@@ -503,8 +503,7 @@ unsigned long module_kallsyms_lookup_name(const char *name)
} }
int module_kallsyms_on_each_symbol(const char *modname, int module_kallsyms_on_each_symbol(const char *modname,
int (*fn)(void *, const char *, int (*fn)(void *, const char *, unsigned long),
struct module *, unsigned long),
void *data) void *data)
{ {
struct module *mod; struct module *mod;
...@@ -533,7 +532,7 @@ int module_kallsyms_on_each_symbol(const char *modname, ...@@ -533,7 +532,7 @@ int module_kallsyms_on_each_symbol(const char *modname,
continue; continue;
ret = fn(data, kallsyms_symbol_name(kallsyms, i), ret = fn(data, kallsyms_symbol_name(kallsyms, i),
mod, kallsyms_symbol_value(sym)); kallsyms_symbol_value(sym));
if (ret != 0) if (ret != 0)
goto out; goto out;
} }
......
...@@ -8391,8 +8391,7 @@ struct kallsyms_data { ...@@ -8391,8 +8391,7 @@ struct kallsyms_data {
* and returns 1 in case we resolved all the requested symbols, * and returns 1 in case we resolved all the requested symbols,
* 0 otherwise. * 0 otherwise.
*/ */
static int kallsyms_callback(void *data, const char *name, static int kallsyms_callback(void *data, const char *name, unsigned long addr)
struct module *mod, unsigned long addr)
{ {
struct kallsyms_data *args = data; struct kallsyms_data *args = data;
const char **sym; const char **sym;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment