git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arc-5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[sfrench/cifs-2.6.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 97a6ff4b7e3cab0bd4501498bf8a7433dc9ca08a..c7d08096e35453652b043323f54b69f4a5812842 100644
(file)
--- a/
arch/arm/lib/copy_to_user.S
+++ b/
arch/arm/lib/copy_to_user.S
@@
-49,7
+49,7
@@
.endm
.macro ldr1b ptr reg cond=al abort
- ldr
\cond\()b
\reg, [\ptr], #1
+ ldr
b\cond
\reg, [\ptr], #1
.endm
#ifdef CONFIG_CPU_USE_DOMAINS