diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
| commit | edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 (patch) | |
| tree | f375d28043dd4457428a841167dc93d760ba9a46 /arch/alpha/lib/strncpy.S | |
| parent | cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 (diff) | |
| parent | e17df688f7064dae1417ce425dd1e4b71d24d63b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 338551c7113c..bbdef1be5f95 100644 --- a/arch/alpha/lib/strncpy.S +++ b/arch/alpha/lib/strncpy.S | |||
| @@ -43,8 +43,8 @@ strncpy: | |||
| 43 | 43 | ||
| 44 | .align 4 | 44 | .align 4 |
| 45 | $multiword: | 45 | $multiword: |
| 46 | subq $24, 1, $2 # clear the final bits in the prev word | 46 | subq $27, 1, $2 # clear the final bits in the prev word |
| 47 | or $2, $24, $2 | 47 | or $2, $27, $2 |
| 48 | zapnot $1, $2, $1 | 48 | zapnot $1, $2, $1 |
| 49 | subq $18, 1, $18 | 49 | subq $18, 1, $18 |
| 50 | 50 | ||
| @@ -70,8 +70,8 @@ $multiword: | |||
| 70 | bne $18, 0b | 70 | bne $18, 0b |
| 71 | 71 | ||
| 72 | 1: ldq_u $1, 0($16) # clear the leading bits in the final word | 72 | 1: ldq_u $1, 0($16) # clear the leading bits in the final word |
| 73 | subq $27, 1, $2 | 73 | subq $24, 1, $2 |
| 74 | or $2, $27, $2 | 74 | or $2, $24, $2 |
| 75 | 75 | ||
| 76 | zap $1, $2, $1 | 76 | zap $1, $2, $1 |
| 77 | stq_u $1, 0($16) | 77 | stq_u $1, 0($16) |