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
/
kernel
/
tt
/
uaccess_user.c
diff --git
a/arch/um/kernel/tt/uaccess_user.c
b/arch/um/kernel/tt/uaccess_user.c
index
6c92bbc
..
ed1abcf
100644
(file)
--- a/
arch/um/kernel/tt/uaccess_user.c
+++ b/
arch/um/kernel/tt/uaccess_user.c
@@
-4,13
+4,13
@@
* Licensed under the GPL
*/
* 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 <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)
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;
struct tt_regs save = TASK_REGS(get_current())->tt;
int ret;
unsigned long *faddrp = (unsigned long *)fault_addr;
-
sig
jmp_buf jbuf;
+ jmp_buf jbuf;
*fault_catcher = &jbuf;
*fault_catcher = &jbuf;
- if(
sigsetjmp(jbuf, 1
) == 0)
+ if(
UML_SETJMP(&jbuf
) == 0)
ret = strlen(str) + 1;
else ret = *faddrp - (unsigned long) str;
ret = strlen(str) + 1;
else ret = *faddrp - (unsigned long) str;