diff options
| author |   Pekka Enberg <penberg@cs.helsinki.fi> | 2006-10-06 00:44:06 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 08:53:42 -0700 |
| commit | 96e1a87392293cf895ea99ab70758453897c7bbf (patch) | |
| tree | eedb25924e61a5aa0348b872505695c525172451 | |
| parent | [PATCH] knfsd: tidy up up meaning of 'buffer size' in nfsd/sunrpc (diff) | |
| download | linux-dev-96e1a87392293cf895ea99ab70758453897c7bbf.tar.xz linux-dev-96e1a87392293cf895ea99ab70758453897c7bbf.zip | |
[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 eee97bb81ba5..7c41dabe7a2c 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 000000000000..3dd9c0b70270 --- /dev/null +++ b/include/asm-um/irq_regs.h @@ -0,0 +1 @@ +#include <asm-generic/irq_regs.h> |