diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
| commit | 7894eaf291238a62a565e9e9777483beeb00eeae (patch) | |
| tree | 43c08830d2030d39d719f3f3d54a0e9b36554770 /arch/alpha/lib/strncpy.S | |
| parent | 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (diff) | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
Merge branch 'upstream' into irq-pio
Diffstat (limited to 'arch/alpha/lib/strncpy.S')
| -rw-r--r-- | arch/alpha/lib/strncpy.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/alpha/lib/strncpy.S b/arch/alpha/lib/strncpy.S index 338551c7113..bbdef1be5f9 100644 --- a/arch/alpha/lib/strncpy.S +++ b/arch/alpha/lib/strncpy.S @@ -43,8 +43,8 @@ strncpy: .align 4 $multiword: - subq $24, 1, $2 # clear the final bits in the prev word - or $2, $24, $2 + subq $27, 1, $2 # clear the final bits in the prev word + or $2, $27, $2 zapnot $1, $2, $1 subq $18, 1, $18 @@ -70,8 +70,8 @@ $multiword: bne $18, 0b 1: ldq_u $1, 0($16) # clear the leading bits in the final word - subq $27, 1, $2 - or $2, $27, $2 + subq $24, 1, $2 + or $2, $24, $2 zap $1, $2, $1 stq_u $1, 0($16) |