diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 10:59:32 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 10:59:32 +0100 |
| commit | 98797a241e28b787b84d308b867ec4c5fe7bbdf8 (patch) | |
| tree | edd39824d91bd8cf33d8903e10ed337611483360 /arch/arm/include | |
| parent | ca8cbc8391cbd4d6e4304fc6b62682ed93d2b165 (diff) | |
| parent | c626e3f5ca1d95ad2204d3128c26e7678714eb55 (diff) | |
| download | kernel_samsung_aries-98797a241e28b787b84d308b867ec4c5fe7bbdf8.zip kernel_samsung_aries-98797a241e28b787b84d308b867ec4c5fe7bbdf8.tar.gz kernel_samsung_aries-98797a241e28b787b84d308b867ec4c5fe7bbdf8.tar.bz2 | |
Merge branch 'copy_user' of git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/uaccess.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index 7897464..0da9bc9 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -386,7 +386,9 @@ do { \ #ifdef CONFIG_MMU extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n); extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n); +extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n); extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n); +extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n); #else #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0) #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0) |