git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fbdev: move FBIO_WAITFORVSYNC to linux/fb.h
[safe/jmp/linux-2.6]
/
include
/
linux
/
uaccess.h
diff --git
a/include/linux/uaccess.h
b/include/linux/uaccess.h
index
6f3c603
..
d512d98
100644
(file)
--- a/
include/linux/uaccess.h
+++ b/
include/linux/uaccess.h
@@
-41,13
+41,13
@@
static inline void pagefault_enable(void)
#ifndef ARCH_HAS_NOCACHE_UACCESS
static inline unsigned long __copy_from_user_inatomic_nocache(void *to,
#ifndef ARCH_HAS_NOCACHE_UACCESS
static inline unsigned long __copy_from_user_inatomic_nocache(void *to,
-
const void __user *from, unsigned long n, unsigned long total
)
+
const void __user *from, unsigned long n
)
{
return __copy_from_user_inatomic(to, from, n);
}
static inline unsigned long __copy_from_user_nocache(void *to,
{
return __copy_from_user_inatomic(to, from, n);
}
static inline unsigned long __copy_from_user_nocache(void *to,
-
const void __user *from, unsigned long n, unsigned long total
)
+
const void __user *from, unsigned long n
)
{
return __copy_from_user(to, from, n);
}
{
return __copy_from_user(to, from, n);
}
@@
-94,6
+94,7
@@
static inline unsigned long __copy_from_user_nocache(void *to,
* happens, handle that and return -EFAULT.
*/
extern long probe_kernel_read(void *dst, void *src, size_t size);
* happens, handle that and return -EFAULT.
*/
extern long probe_kernel_read(void *dst, void *src, size_t size);
+extern long __probe_kernel_read(void *dst, void *src, size_t size);
/*
* probe_kernel_write(): safely attempt to write to a location
/*
* probe_kernel_write(): safely attempt to write to a location
@@
-104,6
+105,7
@@
extern long probe_kernel_read(void *dst, void *src, size_t size);
* Safely write to address @dst from the buffer at @src. If a kernel fault
* happens, handle that and return -EFAULT.
*/
* Safely write to address @dst from the buffer at @src. If a kernel fault
* happens, handle that and return -EFAULT.
*/
-extern long probe_kernel_write(void *dst, void *src, size_t size);
+extern long notrace probe_kernel_write(void *dst, void *src, size_t size);
+extern long notrace __probe_kernel_write(void *dst, void *src, size_t size);
#endif /* __LINUX_UACCESS_H__ */
#endif /* __LINUX_UACCESS_H__ */