aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-01-30 07:33:24 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:24 -0500
commit17abecfe651c862cd31b1f9e8ef6cfc29083f00d (patch)
tree05b990383f2e1fe07f18112f1b716dc3d3781824
parentad8ca495bd3e03e6751fc0c6a6af44018ebb4036 (diff)
x86: fix up alternatives with lockdep enabled
An older binutils bug caused us to not fix up alternatives. This problem involved mutex.c but we dont do lockdep section tricks there anymore, so this workaround is moot. Keep the printk nevertheless, just in case ... We can remove that later on. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/kernel/alternative.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 318a4f9b7ece..45d79ea890ae 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -342,12 +342,13 @@ void alternatives_smp_switch(int smp)
342 342
343#ifdef CONFIG_LOCKDEP 343#ifdef CONFIG_LOCKDEP
344 /* 344 /*
345 * A not yet fixed binutils section handling bug prevents 345 * Older binutils section handling bug prevented
346 * alternatives-replacement from working reliably, so turn 346 * alternatives-replacement from working reliably.
347 * it off: 347 *
348 * If this still occurs then you should see a hang
349 * or crash shortly after this line:
348 */ 350 */
349 printk("lockdep: not fixing up alternatives.\n"); 351 printk("lockdep: fixing up alternatives.\n");
350 return;
351#endif 352#endif
352 353
353 if (noreplace_smp || smp_alt_once) 354 if (noreplace_smp || smp_alt_once)