X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=arch%2Fum%2Fos-Linux%2Fuaccess.c;h=087ed74ffca55081ab7052d51d74103f34d3c7f5;hb=129f8ae9b1b5be94517da76009ea956e89104ce8;hp=38d710158c3d816822c37a43cf3c32c0e0263255;hpb=bb578426253ab9950cc20b4e5dd6aefb5500144f;p=safe%2Fjmp%2Flinux-2.6

diff --git a/arch/um/os-Linux/uaccess.c b/arch/um/os-Linux/uaccess.c
index 38d7101..087ed74 100644
--- a/arch/um/os-Linux/uaccess.c
+++ b/arch/um/os-Linux/uaccess.c
@@ -1,22 +1,22 @@
 /*
  * Copyright (C) 2001 Chris Emerson (cemerson@chiark.greenend.org.uk)
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include <setjmp.h>
-#include <string.h>
+#include <stddef.h>
+#include "longjmp.h"
 
 unsigned long __do_user_copy(void *to, const void *from, int n,
-			     void **fault_addr, void **fault_catcher,
+			     void **fault_addr, jmp_buf **fault_catcher,
 			     void (*op)(void *to, const void *from,
 					int n), int *faulted_out)
 {
 	unsigned long *faddrp = (unsigned long *) fault_addr, ret;
 
-	sigjmp_buf jbuf;
+	jmp_buf jbuf;
 	*fault_catcher = &jbuf;
-	if(sigsetjmp(jbuf, 1) == 0){
+	if (UML_SETJMP(&jbuf) == 0) {
 		(*op)(to, from, n);
 		ret = 0;
 		*faulted_out = 0;