diff --git a/[refs] b/[refs]
index 9088a38136ff..fa694c8f7941 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2148270cd2ebe0d05e4289b7c77b1435c45481bf
+refs/heads/master: 3047e99ede366298c6233d1870d12a520d4d92f3
diff --git a/trunk/arch/i386/kernel/alternative.c b/trunk/arch/i386/kernel/alternative.c
index 7b421b3a053e..28ab80649764 100644
--- a/trunk/arch/i386/kernel/alternative.c
+++ b/trunk/arch/i386/kernel/alternative.c
@@ -303,6 +303,16 @@ void alternatives_smp_switch(int smp)
 	struct smp_alt_module *mod;
 	unsigned long flags;
 
+#ifdef CONFIG_LOCKDEP
+	/*
+	 * A not yet fixed binutils section handling bug prevents
+	 * alternatives-replacement from working reliably, so turn
+	 * it off:
+	 */
+	printk("lockdep: not fixing up alternatives.\n");
+	return;
+#endif
+
 	if (no_replacement || smp_alt_once)
 		return;
 	BUG_ON(!smp && (num_online_cpus() > 1));