[PATCH] um: irq changes break build

[David Howells]

From: Pekka Enberg <penberg@xxxxxxxxxxxxxx>

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 <jdike@xxxxxxxxxxx>
Cc: Paolo "Blaisorblade" Giarrusso <blaisorblade@xxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Signed-Off-By: David Howells <dhowells@xxxxxxxxxx>
---

 arch/um/kernel/irq.c      |   10 ++++++----
 include/asm-um/irq_regs.h |    1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index eee97bb..41b2e53 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -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,
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>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/