Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / x86 / kernel / irq.c

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index d596eba..4616672 100644 (file)
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -231,7 +231,7 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
        entering_irq();
 
        /* entering_irq() tells RCU that we're not quiescent.  Check it. */
-       rcu_lockdep_assert(rcu_is_watching(), "IRQ failed to wake up RCU");
+       RCU_LOCKDEP_WARN(!rcu_is_watching(), "IRQ failed to wake up RCU");
 
        irq = __this_cpu_read(vector_irq[vector]);