kbuild: Always postprocess modules

Currently, we are doing the final module link (.ko) at different places
(Makefile.build vs Makefile.modver) depending on CONFIG_MODVERSIONS.
Apart from being confusing, that also means we have this code path
duplicated, and the modversions path most likely gets little testing.
    
It's actually cleaner to just do the final link from Makefile.modver always,
performance-wise it's not a noticable difference, since we don't descend
in that step, but just use the list of modules generated during the build.
    
This step is also preliminary for doing additional postprocessing, e.g.
generating module alias information from PCI / USB device tables.

1 files changed, 5 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index c25201e8608d2c..e6345e30e9acba 100644
--- a/Makefile
+++ b/Makefile
@@ -405,16 +405,14 @@ $(SUBDIRS): prepare
 
 .PHONY: prepare
 prepare: include/linux/version.h include/asm include/config/MARKER
-ifdef CONFIG_MODVERSIONS
 ifdef KBUILD_MODULES
 ifeq ($(origin SUBDIRS),file)
 	$(Q)rm -rf $(MODVERDIR)
-	$(Q)mkdir $(MODVERDIR)
 else
 	@echo '*** Warning: Overriding SUBDIRS on the command line can cause'
-	@echo '***          inconsistencies with module symbol versions'
-endif
+	@echo '***          inconsistencies'
 endif
+	$(Q)mkdir -p $(MODVERDIR)
 endif
 	@echo '  Starting the build. KBUILD_BUILTIN=$(KBUILD_BUILTIN) KBUILD_MODULES=$(KBUILD_MODULES)'
 
@@ -518,17 +516,11 @@ all: modules
 
 #	Build modules
 
-.PHONY: modules __modversions
-modules: $(SUBDIRS) __modversions
-
-ifdef CONFIG_MODVERSIONS
-
-__modversions: vmlinux $(SUBDIRS)
-	@echo '  Recording module symbol versions.';
+.PHONY: modules
+modules: $(SUBDIRS) $(if $(CONFIG_MODVERSIONS),vmlinux)
+	@echo '  Building modules, stage 2.';
 	$(Q)$(MAKE) -rR -f scripts/Makefile.modver
 
-endif
-
 #	Install modules
 
 .PHONY: modules_install