[PATCH] um: irq changes break build

96e1a873 · Pekka Enberg <[email protected]> · 2006-10-06 00:44:06 -07:00

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

Cc: David Howells <[email protected]>
Cc: Jeff Dike <[email protected]>
Cc: Paolo "Blaisorblade" Giarrusso <[email protected]>
Signed-off-by: Pekka Enberg <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 96e1a87392293cf895ea99ab70758453897c7bbf
Parents: c6b0a9f8

Changes

2 files changed · +2 −1

File	Status	Add	Del	Content
arch/um/kernel/irq.c	modified	+1	−1	View file
include/asm-um/irq_regs.h	added	+1	−0	View file

arch/um/kernel/irq.c

View file

diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index eee97bb..7c41dab 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;
 }

include/asm-um/irq_regs.h

View file

diff --git a/include/asm-um/irq_regs.h b/include/asm-um/irq_regs.h
new file mode 100644
index 0000000..3dd9c0b
--- /dev/null
+++ b/include/asm-um/irq_regs.h
@@ -0,0 +1 @@
+#include <asm-generic/irq_regs.h>