projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
arch
/
um
/
os-Linux
/
uaccess.c
diff --git
a/arch/um/os-Linux/uaccess.c
b/arch/um/os-Linux/uaccess.c
index
38d7101
..
bbb73a6
100644
(file)
--- a/
arch/um/os-Linux/uaccess.c
+++ b/
arch/um/os-Linux/uaccess.c
@@
-4,8
+4,8
@@
* Licensed under the GPL
*/
* Licensed under the GPL
*/
-#include <s
etjmp
.h>
-#include
<string.h>
+#include <s
tddef
.h>
+#include
"longjmp.h"
unsigned long __do_user_copy(void *to, const void *from, int n,
void **fault_addr, void **fault_catcher,
unsigned long __do_user_copy(void *to, const void *from, int n,
void **fault_addr, void **fault_catcher,
@@
-14,9
+14,9
@@
unsigned long __do_user_copy(void *to, const void *from, int n,
{
unsigned long *faddrp = (unsigned long *) fault_addr, ret;
{
unsigned long *faddrp = (unsigned long *) fault_addr, ret;
-
sig
jmp_buf jbuf;
+ jmp_buf jbuf;
*fault_catcher = &jbuf;
*fault_catcher = &jbuf;
- if(
sigsetjmp(jbuf, 1
) == 0){
+ if(
UML_SETJMP(&jbuf
) == 0){
(*op)(to, from, n);
ret = 0;
*faulted_out = 0;
(*op)(to, from, n);
ret = 0;
*faulted_out = 0;