diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-29 18:59:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-29 18:59:58 -0800 |
| commit | 8ef26e177e9c0dc82ef8fca9a3a67097730144dc (patch) | |
| tree | 95754b8bf9d6aae5d6246d22ada8c38360b747ea /include/linux | |
| parent | b8d399aeb8fb2060f2284c54043f1affa0d918f8 (diff) | |
| parent | ae52cf5c50c291b5733aceffe8d1ce2e7c7a4d8d (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/tty-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/module.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 3a411c8c6575..ebdfc27efbb8 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; |