Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[~andy/linux] / arch / um / os-Linux / trap.c

diff --git a/arch/um/os-Linux/trap.c b/arch/um/os-Linux/trap.c
index 321e1c8e227d6248463c3986a1aaf1b933dcb0c0..a9f6b26f9828f8f4c0a99bc6a2f8449054be8bb8 100644 (file)
--- a/arch/um/os-Linux/trap.c
+++ b/arch/um/os-Linux/trap.c
@@ -10,6 +10,7 @@
 #include "user_util.h"
 #include "os.h"
 #include "mode.h"
+#include "longjmp.h"
 
 void usr2_handler(int sig, union uml_pt_regs *regs)
 {
@@ -36,5 +37,5 @@ void do_longjmp(void *b, int val)
 {
        sigjmp_buf *buf = b;
 
-       siglongjmp(*buf, val);
+       UML_SIGLONGJMP(buf, val);
 }