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
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
um
/
include
/
um_uaccess.h
diff --git
a/arch/um/include/um_uaccess.h
b/arch/um/include/um_uaccess.h
index
c9b3574
..
4eb302c
100644
(file)
--- a/
arch/um/include/um_uaccess.h
+++ b/
arch/um/include/um_uaccess.h
@@
-10,29
+10,29
@@
#include "choose-mode.h"
#ifdef CONFIG_MODE_TT
#include "choose-mode.h"
#ifdef CONFIG_MODE_TT
-#include "
../kernel/tt/include/uaccess
.h"
+#include "
uaccess-tt
.h"
#endif
#ifdef CONFIG_MODE_SKAS
#endif
#ifdef CONFIG_MODE_SKAS
-#include "
../kernel/skas/include/uacces
s.h"
+#include "
uaccess-ska
s.h"
#endif
#define access_ok(type, addr, size) \
CHOOSE_MODE_PROC(access_ok_tt, access_ok_skas, type, addr, size)
#endif
#define access_ok(type, addr, size) \
CHOOSE_MODE_PROC(access_ok_tt, access_ok_skas, type, addr, size)
-static inline int verify_area(int type, const void
*
addr, unsigned long size)
+static inline int verify_area(int type, const void
__user *
addr, unsigned long size)
{
{
- return(CHOOSE_MODE_PROC(verify_area_tt, verify_area_skas, type, addr,
+ return
(CHOOSE_MODE_PROC(verify_area_tt, verify_area_skas, type, addr,
size));
}
size));
}
-static inline int copy_from_user(void *to, const void *from, int n)
+static inline int copy_from_user(void *to, const void
__user
*from, int n)
{
return(CHOOSE_MODE_PROC(copy_from_user_tt, copy_from_user_skas, to,
from, n));
}
{
return(CHOOSE_MODE_PROC(copy_from_user_tt, copy_from_user_skas, to,
from, n));
}
-static inline int copy_to_user(void *to, const void *from, int n)
+static inline int copy_to_user(void
__user
*to, const void *from, int n)
{
return(CHOOSE_MODE_PROC(copy_to_user_tt, copy_to_user_skas, to,
from, n));
{
return(CHOOSE_MODE_PROC(copy_to_user_tt, copy_to_user_skas, to,
from, n));
@@
-57,7
+57,7
@@
static inline int copy_to_user(void *to, const void *from, int n)
* and returns @count.
*/
* and returns @count.
*/
-static inline int strncpy_from_user(char *dst, const char *src, int count)
+static inline int strncpy_from_user(char *dst, const char
__user
*src, int count)
{
return(CHOOSE_MODE_PROC(strncpy_from_user_tt, strncpy_from_user_skas,
dst, src, count));
{
return(CHOOSE_MODE_PROC(strncpy_from_user_tt, strncpy_from_user_skas,
dst, src, count));
@@
-89,7
+89,7
@@
static inline int __clear_user(void *mem, int len)
* Returns number of bytes that could not be cleared.
* On success, this will be zero.
*/
* Returns number of bytes that could not be cleared.
* On success, this will be zero.
*/
-static inline int clear_user(void *mem, int len)
+static inline int clear_user(void
__user
*mem, int len)
{
return(CHOOSE_MODE_PROC(clear_user_tt, clear_user_skas, mem, len));
}
{
return(CHOOSE_MODE_PROC(clear_user_tt, clear_user_skas, mem, len));
}
@@
-105,7
+105,7
@@
static inline int clear_user(void *mem, int len)
* On exception, returns 0.
* If the string is too long, returns a value greater than @n.
*/
* On exception, returns 0.
* If the string is too long, returns a value greater than @n.
*/
-static inline int strnlen_user(const void
*str, int
len)
+static inline int strnlen_user(const void
__user *str, long
len)
{
return(CHOOSE_MODE_PROC(strnlen_user_tt, strnlen_user_skas, str, len));
}
{
return(CHOOSE_MODE_PROC(strnlen_user_tt, strnlen_user_skas, str, len));
}