git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
lib
/
strnlen_user.S
diff --git
a/arch/arm/lib/strnlen_user.S
b/arch/arm/lib/strnlen_user.S
index
7855b29
..
0ecbb45
100644
(file)
--- a/
arch/arm/lib/strnlen_user.S
+++ b/
arch/arm/lib/strnlen_user.S
@@
-33,8
+33,8
@@
ENTRY(__strnlen_user)
mov pc, lr
ENDPROC(__strnlen_user)
- .section .fixup,"ax"
+ .
push
section .fixup,"ax"
.align 0
9001: mov r0, #0
mov pc, lr
- .p
revious
+ .p
opsection