um: irq changes break build
PATCH 1/1 um: irq changes break build
From: Pekka Enberg <[email protected]>
Fixup broken UML build due to 7d12e780e003f93433d49ce78cfedf4b4c52adc5 "IRQ:
Maintain regs pointer globally rather than passing to IRQ handlers".
Added code to save/restore regs pointer.
Cc Jeff Dike <[email protected]>
Cc Paolo "Blaisorblade" Giarrusso <[email protected]>
Signed-off-by Pekka Enberg <[email protected]>
Signed-off-by David Howells <[email protected]>
---
arch/um/kernel/irq.c | 10 ++++++---- include/asm-um/irq_regs.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-)
arch/um/kernel/irq.c +6 -4
@@ -355,10 +355,12 @@ #endif*/ unsigned int do_IRQ (int irq,union uml_pt_regs *regs) { -irq_enter (); -__do_IRQ (irq, (struct pt_regs *)regs); -irq_exit (); -return 1 ; +struct pt_regs *old_regs =set_irq_regs (regs); +irq_enter (); +__do_IRQ (irq, (struct pt_regs *)regs); +irq_exit (); +set_irq_regs (old_regs); +return 1 ; } int um_request_irq(unsigned int irq, int fd, int type,
include/asm-um/irq_regs.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/irq_regs.h>