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.

Makefile

@@ -266,7 +266,7 @@ endif
 #	the built-in objects during the descend as well, in order to
 #	make sure the checksums are uptodate before we record them.
 
-ifdef CONFIG_MODVERSIONING
+ifdef CONFIG_MODVERSIONS
 ifeq ($(KBUILD_MODULES),1)
 ifneq ($(KBUILD_BUILTIN),1)
   KBUILD_BUILTIN := 1
@@ -402,7 +402,7 @@ $(SUBDIRS): prepare
 
 .PHONY: prepare
 prepare: include/linux/version.h include/asm include/config/MARKER
-ifdef CONFIG_MODVERSIONING
+ifdef CONFIG_MODVERSIONS
 ifdef KBUILD_MODULES
 ifeq ($(origin SUBDIRS),file)
 	$(Q)rm -rf $(MODVERDIR)
@@ -511,7 +511,7 @@ ifdef CONFIG_MODULES
 .PHONY: modules __modversions
 modules: $(SUBDIRS) __modversions
 
-ifdef CONFIG_MODVERSIONING
+ifdef CONFIG_MODVERSIONS
 
 __modversions: vmlinux $(SUBDIRS)
 	@echo '  Recording module symbol versions.';

drivers/char/ftape/compressor/zftape-compress.c

@@ -1196,11 +1196,7 @@ int zft_compressor_init(void)
 		printk(
 KERN_INFO "(c) 1997 Claus-Justus Heine (claus@momo.math.rwth-aachen.de)\n"
 KERN_INFO "Compressor for zftape (lzrw3 algorithm)\n"
-KERN_INFO "Compiled for kernel version %s"
-#ifdef MODVERSIONS
-		" with versioned symbols"
-#endif
-		"\n", UTS_RELEASE);
+KERN_INFO "Compiled for kernel version %s\n", UTS_RELEASE);
         }
 #else /* !MODULE */
 	/* print a short no-nonsense boot message */

drivers/char/ftape/lowlevel/ftape-init.c

@@ -70,11 +70,7 @@ KERN_INFO "(c) 1993-1996 Bas Laarhoven (bas@vimec.nl)\n"
 KERN_INFO "(c) 1995-1996 Kai Harrekilde-Petersen (khp@dolphinics.no)\n"
 KERN_INFO "(c) 1996-1997 Claus-Justus Heine (claus@momo.math.rwth-aachen.de)\n"
 KERN_INFO "QIC-117 driver for QIC-40/80/3010/3020 floppy tape drives\n"
-KERN_INFO "Compiled for Linux version %s"
-#ifdef MODVERSIONS
-	       " with versioned symbols"
-#endif
-	       "\n", UTS_RELEASE);
+KERN_INFO "Compiled for Linux version %s\n", UTS_RELEASE);
         }
 #else /* !MODULE */
 	/* print a short no-nonsense boot message */

drivers/char/ftape/zftape/zftape-init.c

@@ -331,11 +331,7 @@ KERN_INFO
 KERN_INFO
 "and builtin compression (lzrw3 algorithm).\n"
 KERN_INFO
-"Compiled for Linux version %s"
-#ifdef MODVERSIONS
-		       " with versioned symbols"
-#endif
-		       "\n", UTS_RELEASE);
+"Compiled for Linux version %s\n", UTS_RELEASE);
         }
 #else /* !MODULE */
 	/* print a short no-nonsense boot message */

drivers/scsi/aic7xxx/aic79xx_osm.c

@@ -42,12 +42,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-/*
- * This is the only file where module.h should
- * embed module global version info.
- */
-#define AHD_MODVERSION_FILE
-
 #include "aic79xx_osm.h"
 #include "aic79xx_inline.h"
 #include <scsi/scsicam.h>

drivers/scsi/aic7xxx/aic79xx_osm.h

@@ -50,9 +50,6 @@
 #include <linux/pci.h>
 #include <linux/smp_lock.h>
 #include <linux/version.h>
-#ifndef AHD_MODVERSION_FILE
-#define __NO_VERSION__
-#endif
 #include <linux/module.h>
 #include <asm/byteorder.h>
 

drivers/scsi/aic7xxx/aic7xxx_osm.c

@@ -119,12 +119,6 @@
  *
  */
 
-/*
- * This is the only file where module.h should
- * embed module global version info.
- */
-#define AHC_MODVERSION_FILE
-
 #include "aic7xxx_osm.h"
 #include "aic7xxx_inline.h"
 #include <scsi/scsicam.h>

drivers/scsi/aic7xxx/aic7xxx_osm.h

@@ -67,9 +67,6 @@
 #include <linux/pci.h>
 #include <linux/smp_lock.h>
 #include <linux/version.h>
-#ifndef AHC_MODVERSION_FILE
-#define __NO_VERSION__
-#endif
 #include <linux/module.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>

include/linux/module.h

@@ -155,7 +155,7 @@ void *__symbol_get_gpl(const char *symbol);
 	
 #else
 
-#ifdef CONFIG_MODVERSIONING
+#ifdef CONFIG_MODVERSIONS
 /* Mark the CRC weak since genksyms apparently decides not to
  * generate a checksums for some symbols */
 #define __CRC_SYMBOL(sym, sec)					\

init/Kconfig

@@ -144,11 +144,10 @@ config OBSOLETE_MODPARM
 	  have not been converted to the new module parameter system yet.
 	  If unsure, say Y.
 
-config MODVERSIONING
+config MODVERSIONS
 	bool "Module versioning support (EXPERIMENTAL)"
 	depends on MODULES && EXPERIMENTAL
 	help
-	---help---
 	  Usually, you have to use modules compiled with your kernel.
 	  Saying Y here makes it sometimes possible to use modules
 	  compiled for different kernels, by adding enough information

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);

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. */

scripts/Makefile.build

@@ -45,7 +45,7 @@ O_TARGET := $(obj)/built-in.o
 endif
 endif
 
-ifdef CONFIG_MODVERSIONING
+ifdef CONFIG_MODVERSIONS
 modules := $(obj-m)
 touch-module = @mkdir -p $(MODVERDIR)/$(@D); touch $(MODVERDIR)/$(@:.o=.ko)
 else
@@ -60,7 +60,7 @@ __build: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS)) \
 # Module versioning
 # ---------------------------------------------------------------------------
 
-ifdef CONFIG_MODVERSIONING
+ifdef CONFIG_MODVERSIONS
 
 # $(call if_changed_rule,vcc_o_c) does essentially the same as the
 # normal $(call if_changed_dep,cc_o_c), i.e. compile an object file
@@ -153,7 +153,7 @@ quiet_cmd_cc_o_c = CC $(quiet_modtag)  $@
 cmd_cc_o_c       = $(CC) $(c_flags) -c -o $@ $<
 
 %.o: %.c FORCE
-ifdef CONFIG_MODVERSIONING
+ifdef CONFIG_MODVERSIONS
 	$(call if_changed_rule,vcc_o_c)
 else
 	$(call if_changed_dep,cc_o_c)
@@ -162,7 +162,7 @@ endif
 # For modversioning, we need to special case single-part modules
 # to mark them in $(MODVERDIR)
 
-ifdef CONFIG_MODVERSIONING
+ifdef CONFIG_MODVERSIONS
 $(single-used-m): %.o: %.c FORCE
 	$(touch-module)
 	$(call if_changed_rule,vcc_o_c)
@@ -259,9 +259,9 @@ targets += $(multi-used-y) $(multi-used-m)
 # Rule to link modules ( .o -> .ko )
 #
 
-# With CONFIG_MODVERSIONING, generation of the final .ko is handled
+# With CONFIG_MODVERSIONS, generation of the final .ko is handled
 # by scripts/Makefile.modver
-ifndef CONFIG_MODVERSIONING
+ifndef CONFIG_MODVERSIONS
 
 quiet_cmd_link_module = LD [M]  $@
 cmd_link_module = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_MODULE) -o $@ $< init/vermagic.o