diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-04-12 05:30:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-04-12 05:30:08 -0700 |
| commit | 3e12535b29a4ab4e294c9125a462d1f0d0a8d08b (patch) | |
| tree | 2f4063de216f4c8cb83cf51754b25c98f540000a /include/linux/module.h | |
| parent | 99d6df732eae67df97bb24d898a730ad252a41cf (diff) | |
| parent | eb880e5457f8b4a61ff7fd36d47dd14fe51cb030 (diff) | |
Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 4c9b53d5d51c..0a86652fb1cb 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -70,6 +70,7 @@ static const char __module_cat(name,__LINE__)[] \ extern const struct gtype##_id __mod_##gtype##_table \ __attribute__ ((unused, alias(__stringify(name)))) +extern struct module __this_module; #define THIS_MODULE (&__this_module) #else /* !MODULE */ @@ -481,21 +482,6 @@ static inline int unregister_module_notifier(struct notifier_block * nb) #endif /* CONFIG_MODULES */ -#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"))) = { - .name = __stringify(KBUILD_MODNAME), - .init = init_module, -#ifdef CONFIG_MODULE_UNLOAD - .exit = cleanup_module, -#endif -}; -#endif /* KBUILD_MODNAME */ -#endif /* MODULE */ - #define symbol_request(x) try_then_request_module(symbol_get(x), "symbol:" #x) /* BELOW HERE ALL THESE ARE OBSOLETE AND WILL VANISH */ |