aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/lib/copy_to_user.S
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-14 10:59:32 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-14 10:59:32 +0100
commit98797a241e28b787b84d308b867ec4c5fe7bbdf8 (patch)
treeedd39824d91bd8cf33d8903e10ed337611483360 /arch/arm/lib/copy_to_user.S
parentca8cbc8391cbd4d6e4304fc6b62682ed93d2b165 (diff)
parentc626e3f5ca1d95ad2204d3128c26e7678714eb55 (diff)
Merge branch 'copy_user' of git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/arm/lib/copy_to_user.S')
-rw-r--r--arch/arm/lib/copy_to_user.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
index 22f968bbdff..878820f0a32 100644
--- a/arch/arm/lib/copy_to_user.S
+++ b/arch/arm/lib/copy_to_user.S
@@ -86,7 +86,8 @@
.text
-ENTRY(__copy_to_user)
+ENTRY(__copy_to_user_std)
+WEAK(__copy_to_user)
#include "copy_template.S"