diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/arm/lib/clear_user.S | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/arm/lib/clear_user.S')
| -rw-r--r-- | arch/arm/lib/clear_user.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S index 1279abd8b886..14a0d988c82c 100644 --- a/arch/arm/lib/clear_user.S +++ b/arch/arm/lib/clear_user.S | |||
| @@ -45,9 +45,10 @@ USER( strnebt r2, [r0]) | |||
| 45 | mov r0, #0 | 45 | mov r0, #0 |
| 46 | ldmfd sp!, {r1, pc} | 46 | ldmfd sp!, {r1, pc} |
| 47 | ENDPROC(__clear_user) | 47 | ENDPROC(__clear_user) |
| 48 | ENDPROC(__clear_user_std) | ||
| 48 | 49 | ||
| 49 | .section .fixup,"ax" | 50 | .pushsection .fixup,"ax" |
| 50 | .align 0 | 51 | .align 0 |
| 51 | 9001: ldmfd sp!, {r0, pc} | 52 | 9001: ldmfd sp!, {r0, pc} |
| 52 | .previous | 53 | .popsection |
| 53 | 54 | ||