diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-11 19:18:28 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-11 19:18:28 +0100 |
| commit | c2172ce2303051764829d4958bd50a11ada0590f (patch) | |
| tree | c465594496072249d2ad8ee4642f7c5dcd57e139 /arch/arm/lib/uaccess_with_memcpy.c | |
| parent | a4a5a7379e4ca03c192b732d61e446994eb67bbc (diff) | |
| parent | 0b61f2c0f37983c98ed4207f3f5e265938371b68 (diff) | |
Merge branch 'uaccess' into fixes
Diffstat (limited to 'arch/arm/lib/uaccess_with_memcpy.c')
| -rw-r--r-- | arch/arm/lib/uaccess_with_memcpy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c index 4b39af2dfda9..d72b90905132 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c @@ -136,7 +136,7 @@ out: } unsigned long -__copy_to_user(void __user *to, const void *from, unsigned long n) +arm_copy_to_user(void __user *to, const void *from, unsigned long n) { /* * This test is stubbed out of the main function above to keep @@ -190,7 +190,7 @@ out: return n; } -unsigned long __clear_user(void __user *addr, unsigned long n) +unsigned long arm_clear_user(void __user *addr, unsigned long n) { /* See rational for this in __copy_to_user() above. */ if (n < 64) |