---

yaml --- r: 204637 b: refs/heads/master c: 0d9ec76 h: refs/heads/master i: 204635: d2540ae v: v3
git-mirror · Aug 4, 2010 · 04460e3 · 04460e3
1 parent 8733939
commit 04460e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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)