[PATCH 11/28] kbuild: modpost on vmlinux regardless of CONFIG_MODULES

From: Sam Ravnborg <[email protected]>

Based on patch from: Magnus Damm <[email protected]>
This has the advantage that all section mismatch checks are run regardless
of modules being enabled or not.

When running modpost on vmlinux output:
MODPOST vmlinux

When running modpost on modules output count of modules like this:
MODPOST 5 modules

Signed-off-by: Sam Ravnborg <[email protected]>
---
 Makefile                 |    1 +
 scripts/Makefile         |    2 +-
 scripts/Makefile.modpost |   12 +++++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index b06b1ea..22451c2 100644
--- a/Makefile
+++ b/Makefile
@@ -736,6 +736,7 @@ endif # ifdef CONFIG_KALLSYMS
 # vmlinux image - including updated kernel symbols
 vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
 	$(call if_changed_rule,vmlinux__)
+	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@
 	$(Q)rm -f .old_version
 
 # The actual objects are generated when descending, 
diff --git a/scripts/Makefile b/scripts/Makefile
index d531a1f..ea41de8 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -19,7 +19,7 @@ # The following hostprogs-y programs are
 hostprogs-y += unifdef
 
 subdir-$(CONFIG_MODVERSIONS) += genksyms
-subdir-$(CONFIG_MODULES)     += mod
+subdir-y                     += mod
 
 # Let clean descend into subdirs
 subdir-	+= basic kconfig package
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 0a64688..9137df2 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -51,19 +51,25 @@ _modpost: $(modules)
 
 # Step 2), invoke modpost
 #  Includes step 3,4
-quiet_cmd_modpost = MODPOST
+quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
       cmd_modpost = scripts/mod/modpost            \
         $(if $(CONFIG_MODVERSIONS),-m)             \
 	$(if $(CONFIG_MODULE_SRCVERSION_ALL),-a,)  \
 	$(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile) \
 	$(if $(KBUILD_EXTMOD),-I $(modulesymfile)) \
 	$(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \
-	$(filter-out FORCE,$^)
+	$(wildcard vmlinux) $(filter-out FORCE,$^)
 
 PHONY += __modpost
-__modpost: $(wildcard vmlinux) $(modules:.ko=.o) FORCE
+__modpost: $(modules:.ko=.o) FORCE
 	$(call cmd,modpost)
 
+quiet_cmd_kernel-mod = MODPOST $@
+      cmd_kernel-mod = $(cmd_modpost)
+
+vmlinux: FORCE
+	$(call cmd,kernel-mod)
+
 # Declare generated files as targets for modpost
 $(symverfile):         __modpost ;
 $(modules:.ko=.mod.c): __modpost ;
-- 
1.4.1

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH 12/28] kbuild: make V=2 tell why a target is rebuild
    • From: [email protected]

• References:
  • [PATCH 1/28] kconfig: support DOS line endings
    • From: [email protected]
  • [PATCH 2/28] kbuild: consistently decide when to rebuild a target
    • From: [email protected]
  • [PATCH 3/28] kbuild: add unifdef
    • From: [email protected]
  • [PATCH 4/28] kbuild: replace use of strlcpy with a dedicated implmentation in unifdef
    • From: [email protected]
  • [PATCH 5/28] kbuild: use in-kernel unifdef
    • From: [email protected]
  • [PATCH 6/28] remove RPM_BUILD_ROOT from asm-offsets.h
    • From: [email protected]
  • [PATCH 7/28] kconfig: linguistic fixes for Documentation/kbuild/kconfig-language.txt
    • From: [email protected]
  • [PATCH 8/28] kbuild: linguistic fixes for Documentation/kbuild/modules.txt
    • From: [email protected]
  • [PATCH 9/28] kbuild: linguistic fixes for Documentation/kbuild/makefiles.txt
    • From: [email protected]
  • [PATCH 10/28] kbuild: ignore references from ".pci_fixup" to ".init.text"
    • From: [email protected]

• Prev by Date: [PATCH 13/28] kbuild: make -rR is now default
• Next by Date: [PATCH 6/28] remove RPM_BUILD_ROOT from asm-offsets.h
• Previous by thread: [PATCH 10/28] kbuild: ignore references from ".pci_fixup" to ".init.text"
• Next by thread: [PATCH 12/28] kbuild: make V=2 tell why a target is rebuild
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]