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 branch 'iommu/largepages' into amd-iommu/2.6.35
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
lib
/
copy_from_user.S
diff --git
a/arch/arm/lib/copy_from_user.S
b/arch/arm/lib/copy_from_user.S
index e4fe124acedc80e94e2edc37b7123cc0ef56ae5e..66a477a3e3cc6b039c3d48e2ec4d42c57651626a 100644
(file)
--- a/
arch/arm/lib/copy_from_user.S
+++ b/
arch/arm/lib/copy_from_user.S
@@
-90,7
+90,7
@@
ENTRY(__copy_from_user)
ENDPROC(__copy_from_user)
- .section .fixup,"ax"
+ .
push
section .fixup,"ax"
.align 0
copy_abort_preamble
ldmfd sp!, {r1, r2}
@@
-100,5
+100,5
@@
ENDPROC(__copy_from_user)
bl __memzero
ldr r0, [sp], #4
copy_abort_end
- .p
revious
+ .p
opsection