Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[sfrench/cifs-2.6.git] / arch / microblaze / kernel / irq.c

diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c
index dd32b09b4a3c88ed025b8794b36c8cc612238486..a9345fb4906a8923afa8066a88c6837205b27f7b 100644 (file)
--- a/arch/microblaze/kernel/irq.c
+++ b/arch/microblaze/kernel/irq.c
@@ -27,6 +27,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
 {
        unsigned int irq;
        struct pt_regs *old_regs = set_irq_regs(regs);
+       trace_hardirqs_off();
 
        irq_enter();
        irq = get_irq(regs);
@@ -43,6 +44,7 @@ next_irq:
 
        irq_exit();
        set_irq_regs(old_regs);
+       trace_hardirqs_on();
 }
 
 int show_interrupts(struct seq_file *p, void *v)