From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Fri, 6 Oct 2006 07:44:06 +0000 (-0700)
Subject: [PATCH] um: irq changes break build
X-Git-Tag: v2.6.19-rc2~291
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96e1a87392293cf895ea99ab70758453897c7bbf;p=linux-2.6

[PATCH] um: irq changes break build

Fixup broken UML build due to 7d12e780e003f93433d49ce78cfedf4b4c52adc5
"IRQ: Maintain regs pointer globally rather than passing to IRQ handlers".

Cc: David Howells <dhowells@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo "Blaisorblade" Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index eee97bb81b..7c41dabe7a 100644
--- a/arch/um/kernel/irq.c
+++ b/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/include/asm-um/irq_regs.h b/include/asm-um/irq_regs.h
new file mode 100644
index 0000000000..3dd9c0b702
--- /dev/null
+++ b/include/asm-um/irq_regs.h
@@ -0,0 +1 @@
+#include <asm-generic/irq_regs.h>