From 6a3705089bd8864872903fc16a9b70ad747ea138 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Tue, 5 Apr 2011 13:24:58 +0300
Subject: [PATCH] --- yaml --- r: 250741 b: refs/heads/master c:
 1e2795a1191bb5ff05e80d77feffd51ac875c06d h: refs/heads/master i:   250739:
 9536a4568b083099f46e5c2e3d0dbfd84400af20 v: v3

---
 [refs]             |  2 +-
 trunk/Makefile     | 13 ++++++++-----
 trunk/init/Kconfig | 12 ------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index c49084224799..071a26b02e92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71a83ec7da8910f374a1c82e96d2704aa45d9238
+refs/heads/master: 1e2795a1191bb5ff05e80d77feffd51ac875c06d
diff --git a/trunk/Makefile b/trunk/Makefile
index ba7a55ccd890..c3bd316b16f4 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -797,15 +797,17 @@ ifdef CONFIG_KALLSYMS
 # o The correct .tmp_kallsyms2.o is linked into the final vmlinux.
 # o Verify that the System.map from vmlinux matches the map from
 #   .tmp_vmlinux2, just in case we did not generate kallsyms correctly.
-# o If CONFIG_KALLSYMS_EXTRA_PASS is set, do an extra pass using
+# o If 'make KALLSYMS_EXTRA_PASS=1" was used, do an extra pass using
 #   .tmp_vmlinux3 and .tmp_kallsyms3.o.  This is only meant as a
 #   temporary bypass to allow the kernel to be built while the
 #   maintainers work out what went wrong with kallsyms.
 
-ifdef CONFIG_KALLSYMS_EXTRA_PASS
-last_kallsyms := 3
-else
 last_kallsyms := 2
+
+ifdef KALLSYMS_EXTRA_PASS
+ifneq ($(KALLSYMS_EXTRA_PASS),0)
+last_kallsyms := 3
+endif
 endif
 
 kallsyms.o := .tmp_kallsyms$(last_kallsyms).o
@@ -816,7 +818,8 @@ define verify_kallsyms
 	  $(cmd_sysmap) .tmp_vmlinux$(last_kallsyms) .tmp_System.map
 	$(Q)cmp -s System.map .tmp_System.map ||                             \
 		(echo Inconsistent kallsyms data;                            \
-		 echo Try setting CONFIG_KALLSYMS_EXTRA_PASS;                \
+		 echo This is a bug - please report about it;                \
+		 echo Try "make KALLSYMS_EXTRA_PASS=1" as a workaround;      \
 		 rm .tmp_kallsyms* ; /bin/false )
 endef
 
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 563065df29a5..0edda616640f 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -981,18 +981,6 @@ config KALLSYMS_ALL
 
 	   Say N unless you really need all symbols.
 
-config KALLSYMS_EXTRA_PASS
-	bool "Do an extra kallsyms pass"
-	depends on KALLSYMS
-	help
-	   If kallsyms is not working correctly, the build will fail with
-	   inconsistent kallsyms data.  If that occurs, log a bug report and
-	   turn on KALLSYMS_EXTRA_PASS which should result in a stable build.
-	   Always say N here unless you find a bug in kallsyms, which must be
-	   reported.  KALLSYMS_EXTRA_PASS is only a temporary workaround while
-	   you wait for kallsyms to be fixed.
-
-
 config HOTPLUG
 	bool "Support for hot-pluggable devices" if EXPERT
 	default y