---

yaml --- r: 234701 b: refs/heads/master c: b738a50 h: refs/heads/master i: 234699: b97a691 v: v3
git-mirror · Feb 19, 2011 · ab7e40c · ab7e40c
1 parent a0658a5
commit ab7e40c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1082687e8d6292a61759eb83358e7db39fed1bf4
+refs/heads/master: b738a50a202639614c98b5763b01bf9201779e50
diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c
@@ -68,6 +68,9 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action)
 		ret = action->handler(irq, action->dev_id);
 		trace_irq_handler_exit(irq, action, ret);
 
+		if (WARN_ON_ONCE(!irqs_disabled()))
+			local_irq_disable();
+
 		switch (ret) {
 		case IRQ_WAKE_THREAD:
 			/*
@@ -114,7 +117,6 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action)
 
 	if (status & IRQF_SAMPLE_RANDOM)
 		add_interrupt_randomness(irq);
-	local_irq_disable();
 
 	return retval;
 }