From 6345d2e11ac9c9b40fec908afa6d886bb1ea54c8 Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Wed, 11 Oct 2006 01:21:34 -0700
Subject: [PATCH] --- yaml --- r: 39323 b: refs/heads/master c:
 d875f9fd3f2369bf6f4d0e9989f00fe610eac470 h: refs/heads/master i:   39321:
 dbcc4db5264f37993735aa1bf37b17801aef4d67   39319:
 e933e531ea19e23f831e31231010b0f43e68b8d6 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/um/kernel/tt/uaccess_user.c | 6 +++---
 trunk/arch/um/os-Linux/tt.c            | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8e8f7cdd0047..cfd442eb4353 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e27e80b3da7ad6b90185bd689879888907104a40
+refs/heads/master: d875f9fd3f2369bf6f4d0e9989f00fe610eac470
diff --git a/trunk/arch/um/kernel/tt/uaccess_user.c b/trunk/arch/um/kernel/tt/uaccess_user.c
index 6c92bbccb49c..ed1abcf4d057 100644
--- a/trunk/arch/um/kernel/tt/uaccess_user.c
+++ b/trunk/arch/um/kernel/tt/uaccess_user.c
@@ -4,13 +4,13 @@
  * Licensed under the GPL
  */
 
-#include <setjmp.h>
 #include <string.h>
 #include "user_util.h"
 #include "uml_uaccess.h"
 #include "task.h"
 #include "kern_util.h"
 #include "os.h"
+#include "longjmp.h"
 
 int __do_copy_from_user(void *to, const void *from, int n,
 			void **fault_addr, void **fault_catcher)
@@ -80,10 +80,10 @@ int __do_strnlen_user(const char *str, unsigned long n,
 	struct tt_regs save = TASK_REGS(get_current())->tt;
 	int ret;
 	unsigned long *faddrp = (unsigned long *)fault_addr;
-	sigjmp_buf jbuf;
+	jmp_buf jbuf;
 
 	*fault_catcher = &jbuf;
-	if(sigsetjmp(jbuf, 1) == 0)
+	if(UML_SETJMP(&jbuf) == 0)
 		ret = strlen(str) + 1;
 	else ret = *faddrp - (unsigned long) str;
 
diff --git a/trunk/arch/um/os-Linux/tt.c b/trunk/arch/um/os-Linux/tt.c
index 5461a065bbb9..3dc3a02d6263 100644
--- a/trunk/arch/um/os-Linux/tt.c
+++ b/trunk/arch/um/os-Linux/tt.c
@@ -10,7 +10,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <setjmp.h>
 #include <sys/time.h>
 #include <sys/ptrace.h>
 #include <linux/ptrace.h>