Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 96e1a87392293cf895ea99ab70758453897c7bbf

Authored by Pekka Enberg
Committed by Linus Torvalds
1 parent c6b0a9f87b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 2 changed files with 2 additions and 1 deletions Side-by-side Diff

arch/um/kernel/irq.c
Diff comments   View file @ 96e1a87
... ... @@ -356,7 +356,7 @@
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 }
include/asm-um/irq_regs.h
Diff comments   View file @ 96e1a87
  1 +#include <asm-generic/irq_regs.h>