summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2003-02-03 02:19:44 -0600
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2003-02-03 02:19:44 -0600
commitd5ea3bb59fe2d4a5216e1daa1e5631f47825665e (patch)
treef5fd16b7be17badcd97b7dffd337978ff7f593d9 /kernel
parent6ef80ec1e753a850da410ec592bf52cb14dc77d3 (diff)
kbuild: Rename CONFIG_MODVERSIONING -> CONFIG_MODVERSIONS
CONFIG_MODVERSIONING was a temporary name introduced to distinguish between the old and new module version implementation. Since the traces of the old implementation are now gone from the build system, we rename the config option back in order to not confuse users more than necessary in 2.6. Also, remove some historic modversions cruft throughout the tree.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/ksyms.c7
-rw-r--r--kernel/module.c4
2 files changed, 2 insertions, 9 deletions
diff --git a/kernel/ksyms.c b/kernel/ksyms.c
index 574addf5af63..b65124149fc3 100644
--- a/kernel/ksyms.c
+++ b/kernel/ksyms.c
@@ -68,13 +68,6 @@ extern struct timezone sys_tz;
extern int panic_timeout;
-#ifdef CONFIG_MODVERSIONS
-const struct module_symbol __export_Using_Versions
-__attribute__((section("__ksymtab"))) = {
- 1 /* Version version */, "Using_Versions"
-};
-#endif
-
/* process memory management */
EXPORT_SYMBOL(do_mmap_pgoff);
EXPORT_SYMBOL(do_munmap);
diff --git a/kernel/module.c b/kernel/module.c
index 64fb7e574927..72b3569404bf 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -725,7 +725,7 @@ static int obsolete_params(const char *name,
}
#endif /* CONFIG_OBSOLETE_MODPARM */
-#ifdef CONFIG_MODVERSIONING
+#ifdef CONFIG_MODVERSIONS
static int check_version(Elf_Shdr *sechdrs,
unsigned int versindex,
const char *symname,
@@ -779,7 +779,7 @@ static inline int check_version(Elf_Shdr *sechdrs,
{
return 1;
}
-#endif /* CONFIG_MODVERSIONING */
+#endif /* CONFIG_MODVERSIONS */
/* Resolve a symbol for this module. I.e. if we find one, record usage.
Must be holding module_mutex. */