From 22f9d82882bdfe448d1dd521e74fd221b21268a5 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Mon, 21 Jan 2008 22:57:09 +0100
Subject: [PATCH] --- yaml --- r: 77995 b: refs/heads/master c:
 310f8243a602e9ae950e81b17cbd18a4246674f9 h: refs/heads/master i:   77993:
 dd1ff2908d711b471ab3571fbef2ac9ee9dde510   77991:
 7259fb30c24d4ce817d6487e5d351d5f4981e002 v: v3

---
 [refs]         | 2 +-
 trunk/Makefile | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c7d3088902ef..89025138dbd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91341d4b2c196c689acf90e9e96f28f8d5c6665f
+refs/heads/master: 310f8243a602e9ae950e81b17cbd18a4246674f9
diff --git a/trunk/Makefile b/trunk/Makefile
index 8533f258c0e4..0f84c742ed0e 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -798,7 +798,7 @@ define rule_vmlinux-modpost
 endef
 
 # vmlinux image - including updated kernel symbols
-vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) vmlinux.o FORCE
+vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kallsyms.o) FORCE
 ifdef CONFIG_HEADERS_CHECK
 	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
 endif
@@ -809,7 +809,9 @@ endif
 	$(call if_changed_rule,vmlinux__)
 	$(Q)rm -f .old_version
 
-vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
+# build vmlinux.o first to catch section mismatch errors early
+$(kallsyms.o): vmlinux.o
+vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE
 	$(call if_changed_rule,vmlinux-modpost)
 
 # The actual objects are generated when descending,