diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
| commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
| tree | 76941991e36f4a32bf1be0db3854959053f24619 /arch/arm/include/asm/assembler.h | |
| parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) | |
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 6e8f05c8a1c8..d7575554e407 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h | |||
| @@ -215,7 +215,7 @@ | |||
| 215 | @ Slightly optimised to avoid incrementing the pointer twice | 215 | @ Slightly optimised to avoid incrementing the pointer twice |
| 216 | usraccoff \instr, \reg, \ptr, \inc, 0, \cond, \abort | 216 | usraccoff \instr, \reg, \ptr, \inc, 0, \cond, \abort |
| 217 | .if \rept == 2 | 217 | .if \rept == 2 |
| 218 | usraccoff \instr, \reg, \ptr, \inc, 4, \cond, \abort | 218 | usraccoff \instr, \reg, \ptr, \inc, \inc, \cond, \abort |
| 219 | .endif | 219 | .endif |
| 220 | 220 | ||
| 221 | add\cond \ptr, #\rept * \inc | 221 | add\cond \ptr, #\rept * \inc |