From 04460e38203b5b5ca85a4ac3790aefd209c45097 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 25 May 2010 13:44:38 +0200 Subject: [PATCH] --- yaml --- r: 204637 b: refs/heads/master c: 0d9ec762af297f1ef38114f9498322d994063802 h: refs/heads/master i: 204635: d2540ae6d777b9e339c859f90cedc1cf4c946060 v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/irq.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d85812797b5d..5cae0e10b1a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 570e3e236efdf5bb4a023ecc3601dad9273a011e +refs/heads/master: 0d9ec762af297f1ef38114f9498322d994063802 diff --git a/trunk/arch/microblaze/kernel/irq.c b/trunk/arch/microblaze/kernel/irq.c index 8f120aca123d..598f1fd61c89 100644 --- a/trunk/arch/microblaze/kernel/irq.c +++ b/trunk/arch/microblaze/kernel/irq.c @@ -37,6 +37,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); @@ -53,6 +54,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs) irq_exit(); set_irq_regs(old_regs); + trace_hardirqs_on(); } int show_interrupts(struct seq_file *p, void *v)