On Tue, 22 Jul 2014 14:28:09 +0200 Petr Mladek <[email protected]> wrote:
> It is just a small optimization that allows to replace few > occurrences of within_module_init() || within_module_core() > with a single call. This looks like a nice clean up. Rusty, what do you think? -- Steve > > Signed-off-by: Petr Mladek <[email protected]> > --- > include/linux/module.h | 5 +++++ > kernel/module.c | 12 ++++-------- > 2 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/include/linux/module.h b/include/linux/module.h > index f520a767c86c..61d8fb2d0873 100644 > --- a/include/linux/module.h > +++ b/include/linux/module.h > @@ -408,6 +408,11 @@ static inline int within_module_init(unsigned long addr, > const struct module *mo > addr < (unsigned long)mod->module_init + mod->init_size; > } > > +static inline int within_module(unsigned long addr, const struct module *mod) > +{ > + return within_module_init(addr, mod) || within_module_core(addr, mod); > +} > + > /* Search for module by name: must hold module_mutex. */ > struct module *find_module(const char *name); > > diff --git a/kernel/module.c b/kernel/module.c > index ae79ce615cb9..be0e479ccb5c 100644 > --- a/kernel/module.c > +++ b/kernel/module.c > @@ -3444,8 +3444,7 @@ const char *module_address_lookup(unsigned long addr, > list_for_each_entry_rcu(mod, &modules, list) { > if (mod->state == MODULE_STATE_UNFORMED) > continue; > - if (within_module_init(addr, mod) || > - within_module_core(addr, mod)) { > + if (within_module(addr, mod)) { > if (modname) > *modname = mod->name; > ret = get_ksymbol(mod, addr, size, offset); > @@ -3469,8 +3468,7 @@ int lookup_module_symbol_name(unsigned long addr, char > *symname) > list_for_each_entry_rcu(mod, &modules, list) { > if (mod->state == MODULE_STATE_UNFORMED) > continue; > - if (within_module_init(addr, mod) || > - within_module_core(addr, mod)) { > + if (within_module(addr, mod)) { > const char *sym; > > sym = get_ksymbol(mod, addr, NULL, NULL); > @@ -3495,8 +3493,7 @@ int lookup_module_symbol_attrs(unsigned long addr, > unsigned long *size, > list_for_each_entry_rcu(mod, &modules, list) { > if (mod->state == MODULE_STATE_UNFORMED) > continue; > - if (within_module_init(addr, mod) || > - within_module_core(addr, mod)) { > + if (within_module(addr, mod)) { > const char *sym; > > sym = get_ksymbol(mod, addr, size, offset); > @@ -3760,8 +3757,7 @@ struct module *__module_address(unsigned long addr) > list_for_each_entry_rcu(mod, &modules, list) { > if (mod->state == MODULE_STATE_UNFORMED) > continue; > - if (within_module_core(addr, mod) > - || within_module_init(addr, mod)) > + if (within_module(addr, mod)) > return mod; > } > return NULL; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
