From: Christophe Leroy <christophe.leroy@c-s.fr>
Date: Tue, 22 Sep 2015 14:34:21 +0000 (+0200)
Subject: powerpc: mark xer clobbered in csum_add()
X-Git-Tag: v4.6-rc1~89^2~4^2~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11dfbf588ae697bc5362c24294c2605f09c2d3d4;p=thirdparty%2Fkernel%2Flinux.git

powerpc: mark xer clobbered in csum_add()

addc uses carry so xer is clobbered in csum_add()

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <oss@buserror.net>
---

diff --git a/arch/powerpc/include/asm/checksum.h b/arch/powerpc/include/asm/checksum.h
index e8d9ef4755a49..d2ca07bb88371 100644
--- a/arch/powerpc/include/asm/checksum.h
+++ b/arch/powerpc/include/asm/checksum.h
@@ -141,7 +141,7 @@ static inline __wsum csum_add(__wsum csum, __wsum addend)
 #else
 	asm("addc %0,%0,%1;"
 	    "addze %0,%0;"
-	    : "+r" (csum) : "r" (addend));
+	    : "+r" (csum) : "r" (addend) : "xer");
 	return csum;
 #endif
 }