[PATCH] alpha fixes

Whee! __stxncpy works now.
The patch also fixes OSF1-compatibe readv/writev.

Ivan.

diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S
index 59a91186ace6e6dbfad9631e197f0935f35dad46..e7fea3935f5b401bac48c3f38df59250fd65254f 100644 (file)
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
@@ -4,6 +4,7 @@
  * The system call table. 
  */
 
+#include <linux/config.h>                      /* CONFIG_OSF4_COMPAT */
 #include <asm/unistd.h>
 
        .data

diff --git a/arch/alpha/lib/ev6-stxncpy.S b/arch/alpha/lib/ev6-stxncpy.S
index 0d9aba3865d6b3a888284a27d8b61c7b09367101..2116a5dd42f9c5dc9cae67ed2d1cc001a504eed3 100644 (file)
--- a/arch/alpha/lib/ev6-stxncpy.S
+++ b/arch/alpha/lib/ev6-stxncpy.S
@@ -253,7 +253,7 @@ $u_loop:
 
        stq_u   t0, -8(a0)      # U : save the current word
        beq     a2, $u_eoc      # U :
-       ldq_u   t2, 0(a1)       # U : Latency=3 load high word for next time
+       ldq_u   t2, 8(a1)       # U : Latency=3 load high word for next time
        addq    a1, 8, a1       # E :
 
        extqh   t2, a1, t0      # U : extract low bits (2 cycle stall)

diff --git a/arch/alpha/lib/stxncpy.S b/arch/alpha/lib/stxncpy.S
index 9f0d16737cf0e94a0ddb1d19a7f223c35de76a1b..f6fcef4c42a54d1e71afae43ac46efdab7d5d720 100644 (file)
--- a/arch/alpha/lib/stxncpy.S
+++ b/arch/alpha/lib/stxncpy.S
@@ -210,7 +210,7 @@ $u_loop:
        addq    a0, 8, a0       # .. e1 :
        extql   t2, a1, t1      # e0    : extract high bits for next time
        beq     a2, $u_eoc      # .. e1 :
-       ldq_u   t2, 0(a1)       # e0    : load high word for next time
+       ldq_u   t2, 8(a1)       # e0    : load high word for next time
        addq    a1, 8, a1       # .. e1 :
        nop                     # e0    :
        cmpbge  zero, t2, t8    # e1    : test new word for eos (stall)