projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[cascardo/linux.git]
/
arch
/
arm
/
lib
/
copy_to_user.S
diff --git
a/arch/arm/lib/copy_to_user.S
b/arch/arm/lib/copy_to_user.S
index
caf5019
..
592c179
100644
(file)
--- a/
arch/arm/lib/copy_to_user.S
+++ b/
arch/arm/lib/copy_to_user.S
@@
-13,6
+13,7
@@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/unwind.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/unwind.h>
+#include <asm/export.h>
/*
* Prototype:
/*
* Prototype:
@@
-99,6
+100,9
@@
WEAK(arm_copy_to_user)
ENDPROC(arm_copy_to_user)
ENDPROC(__copy_to_user_std)
ENDPROC(arm_copy_to_user)
ENDPROC(__copy_to_user_std)
+#ifndef CONFIG_UACCESS_WITH_MEMCPY
+EXPORT_SYMBOL(arm_copy_to_user)
+#endif
.pushsection .text.fixup,"ax"
.align 0
.pushsection .text.fixup,"ax"
.align 0