Merge branch 'upstream' into irq-pio

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/um/os-Linux/trap.c b/arch/um/os-Linux/trap.c
index a9f6b26f9828..90b29ae9af46 100644
--- a/arch/um/os-Linux/trap.c
+++ b/arch/um/os-Linux/trap.c
@@ -35,7 +35,7 @@ void os_fill_handlinfo(struct kern_handlers h)
 
 void do_longjmp(void *b, int val)
 {
-        sigjmp_buf *buf = b;
+        jmp_buf *buf = b;
 
-        UML_SIGLONGJMP(buf, val);
+        UML_LONGJMP(buf, val);
 }