diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2006-10-06 03:44:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 11:53:42 -0400 |
commit | 96e1a87392293cf895ea99ab70758453897c7bbf (patch) | |
tree | eedb25924e61a5aa0348b872505695c525172451 | |
parent | c6b0a9f87b82f25fa35206ec04b5160372eabab4 (diff) |
[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>
-rw-r--r-- | arch/um/kernel/irq.c | 2 | ||||
-rw-r--r-- | include/asm-um/irq_regs.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index eee97bb81ba..7c41dabe7a2 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
@@ -356,7 +356,7 @@ void forward_interrupts(int pid) | |||
356 | unsigned int do_IRQ(int irq, union uml_pt_regs *regs) | 356 | unsigned int do_IRQ(int irq, union uml_pt_regs *regs) |
357 | { | 357 | { |
358 | irq_enter(); | 358 | irq_enter(); |
359 | __do_IRQ(irq, (struct pt_regs *)regs); | 359 | __do_IRQ(irq); |
360 | irq_exit(); | 360 | irq_exit(); |
361 | return 1; | 361 | return 1; |
362 | } | 362 | } |
diff --git a/include/asm-um/irq_regs.h b/include/asm-um/irq_regs.h new file mode 100644 index 00000000000..3dd9c0b7027 --- /dev/null +++ b/include/asm-um/irq_regs.h | |||
@@ -0,0 +1 @@ | |||
#include <asm-generic/irq_regs.h> | |||