git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
um
/
os-Linux
/
uaccess.c
diff --git
a/arch/um/os-Linux/uaccess.c
b/arch/um/os-Linux/uaccess.c
index
166fb66
..
bbb73a6
100644
(file)
--- a/
arch/um/os-Linux/uaccess.c
+++ b/
arch/um/os-Linux/uaccess.c
@@
-4,8
+4,7
@@
* Licensed under the GPL
*/
* 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,
#include "longjmp.h"
unsigned long __do_user_copy(void *to, const void *from, int n,
@@
-14,11
+13,10
@@
unsigned long __do_user_copy(void *to, const void *from, int n,
int n), int *faulted_out)
{
unsigned long *faddrp = (unsigned long *) fault_addr, ret;
int n), int *faulted_out)
{
unsigned long *faddrp = (unsigned long *) fault_addr, ret;
- int enable;
-
sig
jmp_buf jbuf;
+ jmp_buf jbuf;
*fault_catcher = &jbuf;
*fault_catcher = &jbuf;
- if(UML_S
IGSETJMP(&jbuf, enable
) == 0){
+ if(UML_S
ETJMP(&jbuf
) == 0){
(*op)(to, from, n);
ret = 0;
*faulted_out = 0;
(*op)(to, from, n);
ret = 0;
*faulted_out = 0;