From 3d062baf967bfb06cb8342cc73bf6ecc6ea751f7 Mon Sep 17 00:00:00 2001
From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Mon, 21 Jan 2008 14:11:22 +0100
Subject: [PATCH] --- yaml --- r: 84983 b: refs/heads/master c:
 9bf79539ed0866f1f67d09e807e745eae9588adb h: refs/heads/master i:   84981:
 c24493bb5919b6191ecf2e85fb1de368ebc6aff2   84979:
 de7e39b927d64be1d3b3c02b5e4a08242f0af1f7   84975:
 a2a07fffdd4467d926fc3c52e19f0d634fcb6535 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/cris/arch-v10/lib/checksum.S | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index adc1f0b096b4..438ad0992e2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab59284eaeb9560926ef5f0a233d91ecb4e64e1a
+refs/heads/master: 9bf79539ed0866f1f67d09e807e745eae9588adb
diff --git a/trunk/arch/cris/arch-v10/lib/checksum.S b/trunk/arch/cris/arch-v10/lib/checksum.S
index 85c48f0a9ec2..7d552f4bd5ae 100644
--- a/trunk/arch/cris/arch-v10/lib/checksum.S
+++ b/trunk/arch/cris/arch-v10/lib/checksum.S
@@ -1,4 +1,4 @@
-/* $Id: checksum.S,v 1.1 2001/12/17 13:59:27 bjornw Exp $
+/*
  * A fast checksum routine using movem
  * Copyright (c) 1998-2001 Axis Communications AB
  *
@@ -61,8 +61,6 @@ _mloop:	movem	[$r10+],$r9	; read 10 longwords
 	
 	ax
 	addq	0,$r12
-	ax			; do it again, since we might have generated a carry
-	addq	0,$r12
 
 	subq	10*4,$r11
 	bge	_mloop
@@ -88,10 +86,6 @@ _word_loop:
 	lsrq	16,$r13		; r13 = checksum >> 16
 	and.d	$r9,$r12		; checksum = checksum & 0xffff
 	add.d	$r13,$r12		; checksum += r13
-	move.d	$r12,$r13		; do the same again, maybe we got a carry last add
-	lsrq	16,$r13
-	and.d	$r9,$r12
-	add.d	$r13,$r12
 
 _no_fold:
 	cmpq	2,$r11