diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-30 22:02:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-30 22:02:51 -0400 |
| commit | a63ecd835f075b21d7d5cef9580447f5fbb36263 (patch) | |
| tree | 952d222271e5aed0c500d3d31b39336f13db2943 /arch/arm/lib/csumpartialcopyuser.S | |
| parent | fc71ff8a6c187ecc1ba79ee5688668af97a970fc (diff) | |
| parent | e76df4d33973bd9b963d0cce05749b090cc14936 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
cyber2000fb: fix console in truecolor modes
cyber2000fb: fix machine hang on module load
SA1111: Eliminate use after free
ARM: Fix Versatile/Realview/VExpress MMC card detection sense
ARM: 6279/1: highmem: fix SMP preemption bug in kmap_high_l1_vipt
ARM: Add barriers to io{read,write}{8,16,32} accessors as well
ARM: 6273/1: Add barriers to the I/O accessors if ARM_DMA_MEM_BUFFERABLE
ARM: 6272/1: Convert L2x0 to use the IO relaxed operations
ARM: 6271/1: Introduce *_relaxed() I/O accessors
ARM: 6275/1: ux500: don't use writeb() in uncompress.h
ARM: 6270/1: clean files in arch/arm/boot/compressed/
ARM: Fix csum_partial_copy_from_user()
Diffstat (limited to 'arch/arm/lib/csumpartialcopyuser.S')
| -rw-r--r-- | arch/arm/lib/csumpartialcopyuser.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S index 59ff6fdc1e63..7d08b43d2c0e 100644 --- a/arch/arm/lib/csumpartialcopyuser.S +++ b/arch/arm/lib/csumpartialcopyuser.S | |||
| @@ -71,7 +71,7 @@ | |||
| 71 | .pushsection .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, [sp, #8*4] @ *err_ptr |
| 75 | str r4, [r5] | 75 | str r4, [r5] |
| 76 | ldmia sp, {r1, r2} @ retrieve dst, len | 76 | ldmia sp, {r1, r2} @ retrieve dst, len |
| 77 | add r2, r2, r1 | 77 | add r2, r2, r1 |