1 files changed, 4 insertions, 21 deletions
diff --git a/arch/s390/include/asm/checksum.h b/arch/s390/include/asm/checksum.h
index d5a8e7c1477..6c00f6800a3 100644
--- a/arch/s390/include/asm/checksum.h
+++ b/arch/s390/include/asm/checksum.h
@@ -78,28 +78,11 @@ csum_partial_copy_nocheck (const void *src, void *dst, int len, __wsum sum)
 */
 static inline __sum16 csum_fold(__wsum sum)
 {
-#ifndef __s390x__
+        u32 csum = (__force u32) sum;
-        register_pair rp;
-        asm volatile(
+        csum += (csum >> 16) + (csum << 16);
-                "       slr     %N1,%N1\n"      /* %0 = H L */
+        csum >>= 16;
-                "       lr      %1,%0\n"        /* %0 = H L, %1 = H L 0 0 */
+        return (__force __sum16) ~csum;
-                "       srdl    %1,16\n"        /* %0 = H L, %1 = 0 H L 0 */
-                "       alr     %1,%N1\n"       /* %0 = H L, %1 = L H L 0 */
-                "       alr     %0,%1\n"        /* %0 = H+L+C L+H */
-                "       srl     %0,16\n"        /* %0 = H+L+C */
-                : "+&d" (sum), "=d" (rp) : : "cc");
-#else /* __s390x__ */
-        asm volatile(
-                "       sr      3,3\n"          /* %0 = H*65536 + L */
-                "       lr      2,%0\n"         /* %0 = H L, 2/3 = H L / 0 0 */
-                "       srdl    2,16\n"         /* %0 = H L, 2/3 = 0 H / L 0 */
-                "       alr     2,3\n"          /* %0 = H L, 2/3 = L H / L 0 */
-                "       alr     %0,2\n"         /* %0 = H+L+C L+H */
-                "       srl     %0,16\n"        /* %0 = H+L+C */
-                : "+&d" (sum) : : "cc", "2", "3");
-#endif /* __s390x__ */
-        return (__force __sum16) ~sum;
 }
 /*

diff --git a/arch/s390/include/asm/checksum.h b/arch/s390/include/asm/checksum.h index d5a8e7c1477..6c00f6800a3 100644 --- a/arch/s390/include/asm/checksum.h +++ b/arch/s390/include/asm/checksum.h
@@ -78,28 +78,11 @@ csum_partial_copy_nocheck (const void src, void dst, int len, __wsum sum)
78	*/	78	*/
79	static inline __sum16 csum_fold(__wsum sum)	79	static inline __sum16 csum_fold(__wsum sum)
80	{	80	{
81	#ifndef __s390x__	81	u32 csum = (__force u32) sum;
82	register_pair rp;
83		82
84	asm volatile(	83	csum += (csum >> 16) + (csum << 16);
85	" slr %N1,%N1\n" /* %0 = H L */	84	csum >>= 16;
86	" lr %1,%0\n" /* %0 = H L, %1 = H L 0 0 */	85	return (__force __sum16) ~csum;
87	" srdl %1,16\n" /* %0 = H L, %1 = 0 H L 0 */
88	" alr %1,%N1\n" /* %0 = H L, %1 = L H L 0 */
89	" alr %0,%1\n" /* %0 = H+L+C L+H */
90	" srl %0,16\n" /* %0 = H+L+C */
91	: "+&d" (sum), "=d" (rp) : : "cc");
92	#else /* __s390x__ */
93	asm volatile(
94	" sr 3,3\n" /* %0 = H65536 + L /
95	" lr 2,%0\n" /* %0 = H L, 2/3 = H L / 0 0 */
96	" srdl 2,16\n" /* %0 = H L, 2/3 = 0 H / L 0 */
97	" alr 2,3\n" /* %0 = H L, 2/3 = L H / L 0 */
98	" alr %0,2\n" /* %0 = H+L+C L+H */
99	" srl %0,16\n" /* %0 = H+L+C */
100	: "+&d" (sum) : : "cc", "2", "3");
101	#endif /* __s390x__ */
102	return (__force __sum16) ~sum;
103	}	86	}
104		87
105	/*	88	/*