Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Pekka Enberg and committed by
Linus Torvalds
96e1a873 c6b0a9f8

+2 -1
+1 -1
arch/um/kernel/irq.c
··· 356 356 unsigned int do_IRQ(int irq, union uml_pt_regs *regs) 357 357 { 358 358 irq_enter(); 359 - __do_IRQ(irq, (struct pt_regs *)regs); 359 + __do_IRQ(irq); 360 360 irq_exit(); 361 361 return 1; 362 362 }
+1
include/asm-um/irq_regs.h
··· 1 + #include <asm-generic/irq_regs.h>