projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
arch
/
i386
/
kernel
/
alternative.c
diff --git
a/arch/i386/kernel/alternative.c
b/arch/i386/kernel/alternative.c
index
7b421b3
..
28ab806
100644
(file)
--- a/
arch/i386/kernel/alternative.c
+++ b/
arch/i386/kernel/alternative.c
@@
-303,6
+303,16
@@
void alternatives_smp_switch(int smp)
struct smp_alt_module *mod;
unsigned long flags;
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));
if (no_replacement || smp_alt_once)
return;
BUG_ON(!smp && (num_online_cpus() > 1));