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/csumpartialcopyuser.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/csumpartialcopyuser.S')
| -rw-r--r-- | arch/arm/lib/csumpartialcopyuser.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S index fd0e9dcd9fdc..59ff6fdc1e63 100644 --- a/arch/arm/lib/csumpartialcopyuser.S +++ b/arch/arm/lib/csumpartialcopyuser.S | |||
| @@ -68,7 +68,7 @@ | |||
| 68 | * so properly, we would have to add in whatever registers were loaded before | 68 | * so properly, we would have to add in whatever registers were loaded before |
| 69 | * the fault, which, with the current asm above is not predictable. | 69 | * the fault, which, with the current asm above is not predictable. |
| 70 | */ | 70 | */ |
| 71 | .section .fixup,"ax" | 71 | .pushsection .fixup,"ax" |
| 72 | .align 4 | 72 | .align 4 |
| 73 | 9001: mov r4, #-EFAULT | 73 | 9001: mov r4, #-EFAULT |
| 74 | ldr r5, [fp, #4] @ *err_ptr | 74 | ldr r5, [fp, #4] @ *err_ptr |
| @@ -80,4 +80,4 @@ | |||
| 80 | strneb r0, [r1], #1 | 80 | strneb r0, [r1], #1 |
| 81 | bne 9002b | 81 | bne 9002b |
| 82 | load_regs | 82 | load_regs |
| 83 | .previous | 83 | .popsection |