From 650ca9a5a4c8e14db10c100e0dd8ac497677be37 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Fri, 6 Oct 2006 00:44:06 -0700
Subject: [PATCH] --- yaml --- r: 39052 b: refs/heads/master c:
 96e1a87392293cf895ea99ab70758453897c7bbf h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/um/kernel/irq.c      | 2 +-
 trunk/include/asm-um/irq_regs.h | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 trunk/include/asm-um/irq_regs.h

diff --git a/[refs] b/[refs]
index 7c25e3623a65..17b4198737ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6b0a9f87b82f25fa35206ec04b5160372eabab4
+refs/heads/master: 96e1a87392293cf895ea99ab70758453897c7bbf
diff --git a/trunk/arch/um/kernel/irq.c b/trunk/arch/um/kernel/irq.c
index eee97bb81ba5..7c41dabe7a2c 100644
--- a/trunk/arch/um/kernel/irq.c
+++ b/trunk/arch/um/kernel/irq.c
@@ -356,7 +356,7 @@ void forward_interrupts(int pid)
 unsigned int do_IRQ(int irq, union uml_pt_regs *regs)
 {
        irq_enter();
-       __do_IRQ(irq, (struct pt_regs *)regs);
+       __do_IRQ(irq);
        irq_exit();
        return 1;
 }
diff --git a/trunk/include/asm-um/irq_regs.h b/trunk/include/asm-um/irq_regs.h
new file mode 100644
index 000000000000..3dd9c0b70270
--- /dev/null
+++ b/trunk/include/asm-um/irq_regs.h
@@ -0,0 +1 @@
+#include <asm-generic/irq_regs.h>