Skip to contentSkip to conversation

UML - update handle_IRQ_event

PATCH New Jeff Dike 1 participant 1 message Sep 14, 2004 User-mode Linux (UML)

lore
Share & tools
lore

Jeff Dike

author
#0 lore raw

PATCH 1/1 UML - update handle_IRQ_event

A small update to make UML's handle_IRQ_event look like the i386 version.

arch/um/kernel/irq.c +3 -2
Index: 2.6.9-rc2/arch/um/kernel/irq.c
===================================================================
@@ -147,7 +147,7 @@
 		     struct irqaction * action)
 {
 	int status = 1;	/* Force the "do bottom halves" bit */
-	int ret;
+	int ret, retval = 0;
 
 	if (!(action->flags & SA_INTERRUPT))
 		local_irq_enable();
@@ -156,6 +156,7 @@
 		ret = action->handler(irq, action->dev_id, regs);
 		if (ret == IRQ_HANDLED)
 			status |= action->flags;
+		retval |= ret;
 		action = action->next;
 	} while (action);
 	if (status & SA_SAMPLE_RANDOM)
@@ -163,7 +164,7 @@
 
 	local_irq_disable();
 
-	return status;
+	return retval;
 }
 
 /*