aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/module.h5
-rw-r--r--kernel/kallsyms.c2
-rw-r--r--kernel/module.c5
3 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index f0b0faf42d5d..799930216626 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -373,7 +373,7 @@ int is_module_address(unsigned long addr);
373/* Returns module and fills in value, defined and namebuf, or NULL if 373/* Returns module and fills in value, defined and namebuf, or NULL if
374 symnum out of range. */ 374 symnum out of range. */
375struct module *module_get_kallsym(unsigned int symnum, unsigned long *value, 375struct module *module_get_kallsym(unsigned int symnum, unsigned long *value,
376 char *type, char *name, size_t namelen); 376 char *type, char *name);
377 377
378/* Look for this name: can be of form module:name. */ 378/* Look for this name: can be of form module:name. */
379unsigned long module_kallsyms_lookup_name(const char *name); 379unsigned long module_kallsyms_lookup_name(const char *name);
@@ -529,8 +529,7 @@ static inline const char *module_address_lookup(unsigned long addr,
529 529
530static inline struct module *module_get_kallsym(unsigned int symnum, 530static inline struct module *module_get_kallsym(unsigned int symnum,
531 unsigned long *value, 531 unsigned long *value,
532 char *type, char *name, 532 char *type, char *name)
533 size_t namelen)
534{ 533{
535 return NULL; 534 return NULL;
536} 535}
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index 5a0de8409739..d086c91d44ed 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -312,7 +312,7 @@ static int get_ksymbol_mod(struct kallsym_iter *iter)
312{ 312{
313 iter->owner = module_get_kallsym(iter->pos - kallsyms_num_syms, 313 iter->owner = module_get_kallsym(iter->pos - kallsyms_num_syms,
314 &iter->value, &iter->type, 314 &iter->value, &iter->type,
315 iter->name, sizeof(iter->name)); 315 iter->name);
316 if (iter->owner == NULL) 316 if (iter->owner == NULL)
317 return 0; 317 return 0;
318 318
diff --git a/kernel/module.c b/kernel/module.c
index 9bdbd1217a6f..43a529a1fa48 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -19,6 +19,7 @@
19#include <linux/module.h> 19#include <linux/module.h>
20#include <linux/moduleloader.h> 20#include <linux/moduleloader.h>
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/kallsyms.h>
22#include <linux/kernel.h> 23#include <linux/kernel.h>
23#include <linux/slab.h> 24#include <linux/slab.h>
24#include <linux/vmalloc.h> 25#include <linux/vmalloc.h>
@@ -2124,7 +2125,7 @@ const char *module_address_lookup(unsigned long addr,
2124} 2125}
2125 2126
2126struct module *module_get_kallsym(unsigned int symnum, unsigned long *value, 2127struct module *module_get_kallsym(unsigned int symnum, unsigned long *value,
2127 char *type, char *name, size_t namelen) 2128 char *type, char *name)
2128{ 2129{
2129 struct module *mod; 2130 struct module *mod;
2130 2131
@@ -2134,7 +2135,7 @@ struct module *module_get_kallsym(unsigned int symnum, unsigned long *value,
2134 *value = mod->symtab[symnum].st_value; 2135 *value = mod->symtab[symnum].st_value;
2135 *type = mod->symtab[symnum].st_info; 2136 *type = mod->symtab[symnum].st_info;
2136 strlcpy(name, mod->strtab + mod->symtab[symnum].st_name, 2137 strlcpy(name, mod->strtab + mod->symtab[symnum].st_name,
2137 namelen); 2138 KSYM_NAME_LEN + 1);
2138 mutex_unlock(&module_mutex); 2139 mutex_unlock(&module_mutex);
2139 return mod; 2140 return mod;
2140 } 2141 }