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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-frv
/
uaccess.h
diff --git
a/include/asm-frv/uaccess.h
b/include/asm-frv/uaccess.h
index
a5bd9bd
..
a1d1404
100644
(file)
--- a/
include/asm-frv/uaccess.h
+++ b/
include/asm-frv/uaccess.h
@@
-67,11
+67,6
@@
static inline int ___range_ok(unsigned long addr, unsigned long size)
#define access_ok(type,addr,size) (__range_ok((addr), (size)) == 0)
#define __access_ok(addr,size) (__range_ok((addr), (size)) == 0)
#define access_ok(type,addr,size) (__range_ok((addr), (size)) == 0)
#define __access_ok(addr,size) (__range_ok((addr), (size)) == 0)
-static inline int verify_area(int type, const void * addr, unsigned long size)
-{
- return __range_ok(addr, size);
-}
-
/*
* The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is
/*
* The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is
@@
-185,16
+180,16
@@
do { \
\
switch (sizeof(*(ptr))) { \
case 1: \
\
switch (sizeof(*(ptr))) { \
case 1: \
- __get_user_asm(__gu_err,
__gu_val, ptr, "ub", "=r");
\
+ __get_user_asm(__gu_err,
*(u8*)&__gu_val, ptr, "ub", "=r");
\
break; \
case 2: \
break; \
case 2: \
- __get_user_asm(__gu_err,
__gu_val, ptr, "uh", "=r");
\
+ __get_user_asm(__gu_err,
*(u16*)&__gu_val, ptr, "uh", "=r");
\
break; \
case 4: \
break; \
case 4: \
- __get_user_asm(__gu_err,
__gu_val, ptr, "", "=r");
\
+ __get_user_asm(__gu_err,
*(u32*)&__gu_val, ptr, "", "=r");
\
break; \
case 8: \
break; \
case 8: \
- __get_user_asm(__gu_err,
__gu_val, ptr, "d", "=e");
\
+ __get_user_asm(__gu_err,
*(u64*)&__gu_val, ptr, "d", "=e");
\
break; \
default: \
__gu_err = __get_user_bad(); \
break; \
default: \
__gu_err = __get_user_bad(); \
@@
-311,7
+306,4
@@
extern long strnlen_user(const char *src, long count);
extern unsigned long search_exception_table(unsigned long addr);
extern unsigned long search_exception_table(unsigned long addr);
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) memcpy(dst, src, len)
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) memcpy(dst, src, len)
-
#endif /* _ASM_UACCESS_H */
#endif /* _ASM_UACCESS_H */