alpha: Fix typo in ev6-copy_user.S

Patch 8525023121de4848b5f0a7d867ffeadbc477774d introduced a typo.

That said, the identity AND insns added by that patch are more
clearly written as MOV.  At the same time, re-schedule the ev6
version so that the first dispatch can execute in parallel.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>

2 files changed, 5 insertions, 4 deletions

diff --git a/arch/alpha/lib/copy_user.S b/arch/alpha/lib/copy_user.S
index 159f1b7e6e49..c277a1a4383e 100644
--- a/arch/alpha/lib/copy_user.S
+++ b/arch/alpha/lib/copy_user.S
@@ -34,7 +34,7 @@
         .ent __copy_user
 __copy_user:
         .prologue 0
-        and $18,$18,$0
+        mov $18,$0
         and $16,7,$3
         beq $0,$35
         beq $3,$36
diff --git a/arch/alpha/lib/ev6-copy_user.S b/arch/alpha/lib/ev6-copy_user.S
index 35e6710d0700..954ca03ebebe 100644
--- a/arch/alpha/lib/ev6-copy_user.S
+++ b/arch/alpha/lib/ev6-copy_user.S
@@ -45,9 +45,10 @@
                                 # Pipeline info: Slotting & Comments
 __copy_user:
         .prologue 0
-        andq $18, $18, $0
-        subq $18, 32, $1        # .. E  .. ..   : Is this going to be a small copy?
-        beq $0, $zerolength     # U  .. .. ..   : U L U L
+        mov $18, $0             # .. .. .. E
+        subq $18, 32, $1        # .. .. E. ..   : Is this going to be a small copy?
+        nop                     # .. E  .. ..
+        beq $18, $zerolength    # U  .. .. ..   : U L U L
 
         and $16,7,$3            # .. .. .. E    : is leading dest misalignment
         ble $1, $onebyteloop    # .. .. U  ..   : 1st branch : small amount of data