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-cris
/
uaccess.h
diff --git
a/include/asm-cris/uaccess.h
b/include/asm-cris/uaccess.h
index
6db1722
..
69d48a2
100644
(file)
--- a/
include/asm-cris/uaccess.h
+++ b/
include/asm-cris/uaccess.h
@@
-91,13
+91,6
@@
#define __access_ok(addr,size) (__kernel_ok || __user_ok((addr),(size)))
#define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size))
#define __access_ok(addr,size) (__kernel_ok || __user_ok((addr),(size)))
#define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size))
-/* this function will go away soon - use access_ok() instead */
-extern inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)
-{
- return access_ok(type,addr,size) ? 0 : -EFAULT;
-}
-
-
#include <asm/arch/uaccess.h>
/*
#include <asm/arch/uaccess.h>
/*
@@
-220,7
+213,7
@@
extern unsigned long __copy_user(void *to, const void *from, unsigned long n);
extern unsigned long __copy_user_zeroing(void *to, const void *from, unsigned long n);
extern unsigned long __do_clear_user(void *to, unsigned long n);
extern unsigned long __copy_user_zeroing(void *to, const void *from, unsigned long n);
extern unsigned long __do_clear_user(void *to, unsigned long n);
-
extern
inline unsigned long
+
static
inline unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
{
if (access_ok(VERIFY_WRITE, to, n))
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
{
if (access_ok(VERIFY_WRITE, to, n))
@@
-228,7
+221,7
@@
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
return n;
}
return n;
}
-
extern
inline unsigned long
+
static
inline unsigned long
__generic_copy_from_user(void *to, const void __user *from, unsigned long n)
{
if (access_ok(VERIFY_READ, from, n))
__generic_copy_from_user(void *to, const void __user *from, unsigned long n)
{
if (access_ok(VERIFY_READ, from, n))
@@
-236,7
+229,7
@@
__generic_copy_from_user(void *to, const void __user *from, unsigned long n)
return n;
}
return n;
}
-
extern
inline unsigned long
+
static
inline unsigned long
__generic_clear_user(void __user *to, unsigned long n)
{
if (access_ok(VERIFY_WRITE, to, n))
__generic_clear_user(void __user *to, unsigned long n)
{
if (access_ok(VERIFY_WRITE, to, n))
@@
-244,13
+237,13
@@
__generic_clear_user(void __user *to, unsigned long n)
return n;
}
return n;
}
-
extern
inline long
+
static
inline long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
return __do_strncpy_from_user(dst, src, count);
}
__strncpy_from_user(char *dst, const char __user *src, long count)
{
return __do_strncpy_from_user(dst, src, count);
}
-
extern
inline long
+
static
inline long
strncpy_from_user(char *dst, const char __user *src, long count)
{
long res = -EFAULT;
strncpy_from_user(char *dst, const char __user *src, long count)
{
long res = -EFAULT;
@@
-263,7
+256,7
@@
strncpy_from_user(char *dst, const char __user *src, long count)
/* Note that if these expand awfully if made into switch constructs, so
don't do that. */
/* Note that if these expand awfully if made into switch constructs, so
don't do that. */
-
extern
inline unsigned long
+
static
inline unsigned long
__constant_copy_from_user(void *to, const void __user *from, unsigned long n)
{
unsigned long ret = 0;
__constant_copy_from_user(void *to, const void __user *from, unsigned long n)
{
unsigned long ret = 0;
@@
-313,7
+306,7
@@
__constant_copy_from_user(void *to, const void __user *from, unsigned long n)
/* Ditto, don't make a switch out of this. */
/* Ditto, don't make a switch out of this. */
-
extern
inline unsigned long
+
static
inline unsigned long
__constant_copy_to_user(void __user *to, const void *from, unsigned long n)
{
unsigned long ret = 0;
__constant_copy_to_user(void __user *to, const void *from, unsigned long n)
{
unsigned long ret = 0;
@@
-363,7
+356,7
@@
__constant_copy_to_user(void __user *to, const void *from, unsigned long n)
/* No switch, please. */
/* No switch, please. */
-
extern
inline unsigned long
+
static
inline unsigned long
__constant_clear_user(void __user *to, unsigned long n)
{
unsigned long ret = 0;
__constant_clear_user(void __user *to, unsigned long n)
{
unsigned long ret = 0;
@@
-413,19
+406,19
@@
__constant_clear_user(void __user *to, unsigned long n)
* used in fast paths and have only a small space overhead.
*/
* used in fast paths and have only a small space overhead.
*/
-
extern
inline unsigned long
+
static
inline unsigned long
__generic_copy_from_user_nocheck(void *to, const void *from, unsigned long n)
{
return __copy_user_zeroing(to,from,n);
}
__generic_copy_from_user_nocheck(void *to, const void *from, unsigned long n)
{
return __copy_user_zeroing(to,from,n);
}
-
extern
inline unsigned long
+
static
inline unsigned long
__generic_copy_to_user_nocheck(void *to, const void *from, unsigned long n)
{
return __copy_user(to,from,n);
}
__generic_copy_to_user_nocheck(void *to, const void *from, unsigned long n)
{
return __copy_user(to,from,n);
}
-
extern
inline unsigned long
+
static
inline unsigned long
__generic_clear_user_nocheck(void *to, unsigned long n)
{
return __do_clear_user(to,n);
__generic_clear_user_nocheck(void *to, unsigned long n)
{
return __do_clear_user(to,n);