diff options
| author | Dave Jones <davej@halogen.(none)> | 2002-12-30 23:08:22 +0000 |
|---|---|---|
| committer | Dave Jones <davej@halogen.(none)> | 2002-12-30 23:08:22 +0000 |
| commit | 1f46ead556d590cbb585ecaebe8ac1871d3c6dab (patch) | |
| tree | 680083ed2d1564b17306d6cfee9d2b1a3c973f29 /include/linux/module.h | |
| parent | 05ae9880250d5ffe81f9385a83b8d4e73ca5c4c0 (diff) | |
| parent | 43fb68dc00a8ab0b728e27c2a8fd4033d2ba0932 (diff) | |
Merge halogen.(none):/home/davej/src/kernel/2.5/bk-linus
into halogen.(none):/home/davej/src/kernel/2.5/agpgart
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) |