diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-12-30 23:59:34 -0600 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-12-30 23:59:34 -0600 |
| commit | 50c8161e1c1fe7bac4ca12bc64b7c94ab09b09e1 (patch) | |
| tree | 85bd315e0a4053b0253b9b56c0315f3a73930e13 /include/linux/module.h | |
| parent | d6855047db037c11826be1e9a64c468614bdb1b0 (diff) | |
| parent | d5f1f33d1a5a400539ba24937b9b9a1de8474d94 (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 3a411c8c6575..8e1954a89913 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -285,7 +285,9 @@ static inline const char *module_address_lookup(unsigned long addr, } #endif /* CONFIG_MODULES */ -#if defined(MODULE) && defined(KBUILD_MODNAME) +#ifdef MODULE +extern struct module __this_module; +#ifdef KBUILD_MODNAME /* We make the linker do some of the work. */ struct module __this_module __attribute__((section(".gnu.linkonce.this_module"))) = { @@ -296,7 +298,8 @@ __attribute__((section(".gnu.linkonce.this_module"))) = { .exit = cleanup_module, #endif }; -#endif /* MODULE && KBUILD_MODNAME */ +#endif /* KBUILD_MODNAME */ +#endif /* MODULE */ /* For archs to search exception tables */ extern struct list_head extables; @@ -354,7 +357,6 @@ static inline void __deprecated _MOD_INC_USE_COUNT(struct module *module) _MOD_INC_USE_COUNT(THIS_MODULE) #define MOD_DEC_USE_COUNT \ __MOD_DEC_USE_COUNT(THIS_MODULE) -#define try_inc_mod_count(mod) try_module_get(mod) #define EXPORT_NO_SYMBOLS extern int module_dummy_usage; #define GET_USE_COUNT(module) (module_dummy_usage) |