|
@@ -301,25 +301,20 @@ void __print_symbol(const char *fmt, unsigned long address)
|
|
|
struct kallsym_iter
|
|
|
{
|
|
|
loff_t pos;
|
|
|
- struct module *owner;
|
|
|
unsigned long value;
|
|
|
unsigned int nameoff; /* If iterating in core kernel symbols */
|
|
|
char type;
|
|
|
char name[KSYM_NAME_LEN+1];
|
|
|
+ char module_name[MODULE_NAME_LEN + 1];
|
|
|
+ int exported;
|
|
|
};
|
|
|
|
|
|
static int get_ksymbol_mod(struct kallsym_iter *iter)
|
|
|
{
|
|
|
- iter->owner = module_get_kallsym(iter->pos - kallsyms_num_syms,
|
|
|
- &iter->value, &iter->type,
|
|
|
- iter->name);
|
|
|
- if (iter->owner == NULL)
|
|
|
+ if (module_get_kallsym(iter->pos - kallsyms_num_syms, &iter->value,
|
|
|
+ &iter->type, iter->name, iter->module_name,
|
|
|
+ &iter->exported) < 0)
|
|
|
return 0;
|
|
|
-
|
|
|
- /* Label it "global" if it is exported, "local" if not exported. */
|
|
|
- iter->type = is_exported(iter->name, iter->owner)
|
|
|
- ? toupper(iter->type) : tolower(iter->type);
|
|
|
-
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
@@ -328,7 +323,7 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
|
|
|
{
|
|
|
unsigned off = iter->nameoff;
|
|
|
|
|
|
- iter->owner = NULL;
|
|
|
+ iter->module_name[0] = '\0';
|
|
|
iter->value = kallsyms_addresses[iter->pos];
|
|
|
|
|
|
iter->type = kallsyms_get_symbol_type(off);
|
|
@@ -392,12 +387,17 @@ static int s_show(struct seq_file *m, void *p)
|
|
|
if (!iter->name[0])
|
|
|
return 0;
|
|
|
|
|
|
- if (iter->owner)
|
|
|
+ if (iter->module_name[0]) {
|
|
|
+ char type;
|
|
|
+
|
|
|
+ /* Label it "global" if it is exported,
|
|
|
+ * "local" if not exported. */
|
|
|
+ type = iter->exported ? toupper(iter->type) :
|
|
|
+ tolower(iter->type);
|
|
|
seq_printf(m, "%0*lx %c %s\t[%s]\n",
|
|
|
(int)(2*sizeof(void*)),
|
|
|
- iter->value, iter->type, iter->name,
|
|
|
- module_name(iter->owner));
|
|
|
- else
|
|
|
+ iter->value, type, iter->name, iter->module_name);
|
|
|
+ } else
|
|
|
seq_printf(m, "%0*lx %c %s\n",
|
|
|
(int)(2*sizeof(void*)),
|
|
|
iter->value, iter->type, iter->name);
|