summaryrefslogtreecommitdiff
path: root/arch/arm/lib/copy_to_user.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-08-19 11:02:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-08-25 16:14:43 +0100
commit3fba7e23f754a9a6e639b640fa2a393712ffe1b8 (patch)
treec9a472b59b67700bdde134a4dc707ae607837faa /arch/arm/lib/copy_to_user.S
parent08446b129bbde34665c423d882f857a45b8c3aed (diff)
ARM: uaccess: provide uaccess_save_and_enable() and uaccess_restore()
Provide uaccess_save_and_enable() and uaccess_restore() to permit control of userspace visibility to the kernel, and hook these into the appropriate places in the kernel where we need to access userspace. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/lib/copy_to_user.S')
-rw-r--r--arch/arm/lib/copy_to_user.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
index 9648b0675a3e..caf5019d8161 100644
--- a/arch/arm/lib/copy_to_user.S
+++ b/arch/arm/lib/copy_to_user.S
@@ -17,7 +17,7 @@
/*
* Prototype:
*
- * size_t __copy_to_user(void *to, const void *from, size_t n)
+ * size_t arm_copy_to_user(void *to, const void *from, size_t n)
*
* Purpose:
*
@@ -93,11 +93,11 @@
.text
ENTRY(__copy_to_user_std)
-WEAK(__copy_to_user)
+WEAK(arm_copy_to_user)
#include "copy_template.S"
-ENDPROC(__copy_to_user)
+ENDPROC(arm_copy_to_user)
ENDPROC(__copy_to_user_std)
.pushsection .text.fixup,"ax"