Commit 0d967d28 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] uml: update handle_IRQ_event

A small update to make UML's handle_IRQ_event look like the i386 version.
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5a411c46
...@@ -147,7 +147,7 @@ int handle_IRQ_event(unsigned int irq, struct pt_regs * regs, ...@@ -147,7 +147,7 @@ int handle_IRQ_event(unsigned int irq, struct pt_regs * regs,
struct irqaction * action) struct irqaction * action)
{ {
int status = 1; /* Force the "do bottom halves" bit */ int status = 1; /* Force the "do bottom halves" bit */
int ret; int ret, retval = 0;
if (!(action->flags & SA_INTERRUPT)) if (!(action->flags & SA_INTERRUPT))
local_irq_enable(); local_irq_enable();
...@@ -156,6 +156,7 @@ int handle_IRQ_event(unsigned int irq, struct pt_regs * regs, ...@@ -156,6 +156,7 @@ int handle_IRQ_event(unsigned int irq, struct pt_regs * regs,
ret = action->handler(irq, action->dev_id, regs); ret = action->handler(irq, action->dev_id, regs);
if (ret == IRQ_HANDLED) if (ret == IRQ_HANDLED)
status |= action->flags; status |= action->flags;
retval |= ret;
action = action->next; action = action->next;
} while (action); } while (action);
if (status & SA_SAMPLE_RANDOM) if (status & SA_SAMPLE_RANDOM)
...@@ -163,7 +164,7 @@ int handle_IRQ_event(unsigned int irq, struct pt_regs * regs, ...@@ -163,7 +164,7 @@ int handle_IRQ_event(unsigned int irq, struct pt_regs * regs,
local_irq_disable(); local_irq_disable();
return status; return retval;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment