From 6b3cb49719f1004b8f1b3801cefa3d67e060b99f Mon Sep 17 00:00:00 2001
From: Nick Alcock <nick.alcock@oracle.com>
Date: Mon, 14 May 2012 11:24:44 +0100
Subject: [PATCH] kallsyms: work in a clean tree, and a non-modular tree.

kallsyms nowadays relies upon modules.builtin, so we must make sure that
modules.builtin is there before kallsyms runs.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
---
 Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index f5c8983aeeb7..0c0c33eb0d96 100644
--- a/Makefile
+++ b/Makefile
@@ -916,7 +916,7 @@ quiet_cmd_link-vmlinux = LINK    $@
 
 # Include targets which we want to
 # execute if the rest of the kernel build went well.
-vmlinux: scripts/link-vmlinux.sh $(vmlinux-deps) FORCE
+vmlinux: scripts/link-vmlinux.sh $(vmlinux-deps) modules.builtin FORCE
 ifdef CONFIG_HEADERS_CHECK
 	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
 endif
@@ -1102,13 +1102,6 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
 
-modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
-	$(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin
-
-%/modules.builtin: include/config/auto.conf
-	$(Q)$(MAKE) $(modbuiltin)=$*
-
-
 # Target to prepare building external modules
 PHONY += modules_prepare
 modules_prepare: prepare scripts
@@ -1160,6 +1153,14 @@ modules modules_install: FORCE
 
 endif # CONFIG_MODULES
 
+# modules.builtin is used by kallsyms as well.
+
+modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
+	$(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin
+
+%/modules.builtin: include/config/auto.conf
+	$(Q)$(MAKE) $(modbuiltin)=$*
+
 ###
 # Cleaning is done on three levels.
 # make clean     Delete most generated files
-- 
2.50.1