From b6da2491465c022c15b4f0f6aa423914593574b5 Mon Sep 17 00:00:00 2001
From: Jiri Bohac <jbohac@suse.cz>
Date: Wed, 2 Sep 2009 11:00:46 +0200
Subject: [PATCH] --- yaml --- r: 157237 b: refs/heads/master c:
 5afe18d2f58812f3924edbd215464e5e3e8545e7 h: refs/heads/master i:   157235:
 355936e15e4616dfd449696c194dd8fca4ba0727 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/ia64/lib/ip_fast_csum.S | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c0a16717d80b..96ab8146dbd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2486f26692433ba27cc10991a085b503b0422a3
+refs/heads/master: 5afe18d2f58812f3924edbd215464e5e3e8545e7
diff --git a/trunk/arch/ia64/lib/ip_fast_csum.S b/trunk/arch/ia64/lib/ip_fast_csum.S
index 1f86aeb2c948..620d9dc5220f 100644
--- a/trunk/arch/ia64/lib/ip_fast_csum.S
+++ b/trunk/arch/ia64/lib/ip_fast_csum.S
@@ -96,20 +96,22 @@ END(ip_fast_csum)
 GLOBAL_ENTRY(csum_ipv6_magic)
 	ld4	r20=[in0],4
 	ld4	r21=[in1],4
-	dep	r15=in3,in2,32,16
+	zxt4	in2=in2
 	;;
 	ld4	r22=[in0],4
 	ld4	r23=[in1],4
-	mux1	r15=r15,@rev
+	dep	r15=in3,in2,32,16
 	;;
 	ld4	r24=[in0],4
 	ld4	r25=[in1],4
-	shr.u	r15=r15,16
+	mux1	r15=r15,@rev
 	add	r16=r20,r21
 	add	r17=r22,r23
+	zxt4	in4=in4
 	;;
 	ld4	r26=[in0],4
 	ld4	r27=[in1],4
+	shr.u	r15=r15,16
 	add	r18=r24,r25
 	add	r8=r16,r17
 	;;