I prefer this: it also has the advantage of ensuring the name of
built-in modules is consistent across the kernel.
Thanks for the report,
Rusty.
-- Anyone who quotes me in their sig is an idiot. -- Rusty Russell.diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.5.47-module-alias/crypto/api.c working-2.5.47-modname/crypto/api.c --- working-2.5.47-module-alias/crypto/api.c 2002-11-11 20:00:55.000000000 +1100 +++ working-2.5.47-modname/crypto/api.c 2002-11-13 04:30:48.000000000 +1100 @@ -263,8 +263,7 @@ static int c_show(struct seq_file *m, vo struct crypto_alg *alg = (struct crypto_alg *)p; seq_printf(m, "name : %s\n", alg->cra_name); - seq_printf(m, "module : %s\n", alg->cra_module ? - alg->cra_module->name : "[static]"); + seq_printf(m, "module : %s\n", module_name(alg->cra_module)); seq_printf(m, "blocksize : %u\n", alg->cra_blocksize); switch (alg->cra_flags & CRYPTO_ALG_TYPE_MASK) { diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.5.47-module-alias/include/linux/module.h working-2.5.47-modname/include/linux/module.h --- working-2.5.47-module-alias/include/linux/module.h 2002-11-12 22:43:55.000000000 +1100 +++ working-2.5.47-modname/include/linux/module.h 2002-11-13 04:31:16.000000000 +1100 @@ -293,6 +293,13 @@ static inline void module_put(struct mod #endif /* CONFIG_MODULE_UNLOAD */ +static inline char *module_name(struct module *module) +{ + if (module) + return module->name; + return "[built-in]"; +} + #define __unsafe(mod) \ do { \ if (mod && !(mod)->unsafe) { \ @@ -315,6 +322,10 @@ do { \ #define try_module_get(module) 1 #define module_put(module) do { } while(0) +static inline char *module_name(struct module *module) +{ + Return "[built-in]"; +} #define __unsafe(mod) #endif /* CONFIG_MODULES */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Nov 15 2002 - 22:00:26 EST