[PATCH] Alpha: strncpy() fix

As it turned out after recent SCSI changes, strncpy() was broken -
it mixed up the return values from __stxncpy() in registers $24 and $27.

Thanks to Mathieu Chouquet-Stringer for tracking down the problem
and providing an excellent test case.

Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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:
 
         .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)