patch-2.3.99-pre3 linux/arch/i386/lib/checksum.S

• Lines: 52
• Date: Wed Mar 22 22:23:54 2000
• Orig file: v2.3.99-pre2/linux/arch/i386/lib/checksum.S
• Orig date: Sun May 16 13:17:22 1999

diff -u --recursive --new-file v2.3.99-pre2/linux/arch/i386/lib/checksum.S linux/arch/i386/lib/checksum.S
@@ -25,6 +25,7 @@
  *		2 of the License, or (at your option) any later version.
  */
 
+#include <linux/config.h>
 #include <asm/errno.h>
 				
 /*
@@ -39,7 +40,7 @@
 .align 4
 .globl csum_partial								
 		
-#if CPU!=686
+#ifndef CONFIG_X86_USE_PPRO_CHECKSUM
 
 	  /*		
 	   * Experiments with Ethernet and SLIP connections show that buff
@@ -114,7 +115,9 @@
 	popl %esi
 	ret
 
-#else /* CPU==686 */
+#else
+
+/* Version for PentiumII/PPro */
 
 csum_partial:
 	pushl %esi
@@ -210,7 +213,7 @@
 	popl %esi
 	ret
 				
-#endif /* CPU==686 */ 
+#endif
 
 /*
 unsigned int csum_partial_copy_generic (const char *src, char *dst,
@@ -243,7 +246,7 @@
 .align 4
 .globl csum_partial_copy_generic
 				
-#if CPU!=686
+#ifndef CONFIG_X86_USE_PPRO_CHECKSUM
 
 #define ARGBASE 16		
 #define FP		12
@@ -448,4 +451,4 @@
 #undef ROUND
 #undef ROUND1		
 		
-#endif	/* CPU==i686 */ 
+#endif