From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Mon, 21 Jan 2008 13:11:22 +0000 (+0100)
Subject: CRIS v10: Remove duplicated folding of carry from lib/checksum.S, it is not needed.
X-Git-Tag: v2.6.25-rc1~40^2~81
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9bf79539ed0866f1f67d09e807e745eae9588adb;p=linux-2.6-omap-h63xx.git

CRIS v10: Remove duplicated folding of carry from lib/checksum.S, it is not needed.

Also, remove useless CVS id tag.
---

diff --git a/arch/cris/arch-v10/lib/checksum.S b/arch/cris/arch-v10/lib/checksum.S
index 85c48f0a9ec..7d552f4bd5a 100644
--- a/arch/cris/arch-v10/lib/checksum.S
+++ b/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