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/copy_from_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/copy_from_user.S')
| -rw-r--r-- | arch/arm/lib/copy_from_user.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S index e4fe124acedc..66a477a3e3cc 100644 --- a/arch/arm/lib/copy_from_user.S +++ b/arch/arm/lib/copy_from_user.S | |||
| @@ -90,7 +90,7 @@ ENTRY(__copy_from_user) | |||
| 90 | 90 | ||
| 91 | ENDPROC(__copy_from_user) | 91 | ENDPROC(__copy_from_user) |
| 92 | 92 | ||
| 93 | .section .fixup,"ax" | 93 | .pushsection .fixup,"ax" |
| 94 | .align 0 | 94 | .align 0 |
| 95 | copy_abort_preamble | 95 | copy_abort_preamble |
| 96 | ldmfd sp!, {r1, r2} | 96 | ldmfd sp!, {r1, r2} |
| @@ -100,5 +100,5 @@ ENDPROC(__copy_from_user) | |||
| 100 | bl __memzero | 100 | bl __memzero |
| 101 | ldr r0, [sp], #4 | 101 | ldr r0, [sp], #4 |
| 102 | copy_abort_end | 102 | copy_abort_end |
| 103 | .previous | 103 | .popsection |
| 104 | 104 | ||