|
@@ -2390,7 +2390,7 @@ static const char *get_ksymbol(struct module *mod,
|
|
|
unsigned long nextval;
|
|
|
|
|
|
/* At worse, next value is at end of module */
|
|
|
- if (within(addr, mod->module_init, mod->init_size))
|
|
|
+ if (within_module_init(addr, mod))
|
|
|
nextval = (unsigned long)mod->module_init+mod->init_text_size;
|
|
|
else
|
|
|
nextval = (unsigned long)mod->module_core+mod->core_text_size;
|
|
@@ -2438,8 +2438,8 @@ const char *module_address_lookup(unsigned long addr,
|
|
|
|
|
|
preempt_disable();
|
|
|
list_for_each_entry_rcu(mod, &modules, list) {
|
|
|
- if (within(addr, mod->module_init, mod->init_size)
|
|
|
- || within(addr, mod->module_core, mod->core_size)) {
|
|
|
+ if (within_module_init(addr, mod) ||
|
|
|
+ within_module_core(addr, mod)) {
|
|
|
if (modname)
|
|
|
*modname = mod->name;
|
|
|
ret = get_ksymbol(mod, addr, size, offset);
|
|
@@ -2461,8 +2461,8 @@ int lookup_module_symbol_name(unsigned long addr, char *symname)
|
|
|
|
|
|
preempt_disable();
|
|
|
list_for_each_entry_rcu(mod, &modules, list) {
|
|
|
- if (within(addr, mod->module_init, mod->init_size) ||
|
|
|
- within(addr, mod->module_core, mod->core_size)) {
|
|
|
+ if (within_module_init(addr, mod) ||
|
|
|
+ within_module_core(addr, mod)) {
|
|
|
const char *sym;
|
|
|
|
|
|
sym = get_ksymbol(mod, addr, NULL, NULL);
|
|
@@ -2485,8 +2485,8 @@ int lookup_module_symbol_attrs(unsigned long addr, unsigned long *size,
|
|
|
|
|
|
preempt_disable();
|
|
|
list_for_each_entry_rcu(mod, &modules, list) {
|
|
|
- if (within(addr, mod->module_init, mod->init_size) ||
|
|
|
- within(addr, mod->module_core, mod->core_size)) {
|
|
|
+ if (within_module_init(addr, mod) ||
|
|
|
+ within_module_core(addr, mod)) {
|
|
|
const char *sym;
|
|
|
|
|
|
sym = get_ksymbol(mod, addr, size, offset);
|
|
@@ -2705,7 +2705,7 @@ int is_module_address(unsigned long addr)
|
|
|
preempt_disable();
|
|
|
|
|
|
list_for_each_entry_rcu(mod, &modules, list) {
|
|
|
- if (within(addr, mod->module_core, mod->core_size)) {
|
|
|
+ if (within_module_core(addr, mod)) {
|
|
|
preempt_enable();
|
|
|
return 1;
|
|
|
}
|