Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / metag / include / asm / checksum.h

diff --git a/arch/metag/include/asm/checksum.h b/arch/metag/include/asm/checksum.h
index 999bf761a732b0da788c0df1df7916d38e9f1094..08dd1cc65799a5f9aadcb515a332ab6ec611b7d6 100644 (file)
--- a/arch/metag/include/asm/checksum.h
+++ b/arch/metag/include/asm/checksum.h
@@ -64,7 +64,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
                                        __wsum sum)
 {
        unsigned long len_proto = (proto + len) << 8;
-       asm ("ADD    %0, %0, %1\n"
+       asm ("ADDS   %0, %0, %1\n"
+            "ADDCS  %0, %0, #1\n"
             "ADDS   %0, %0, %2\n"
             "ADDCS  %0, %0, #1\n"
             "ADDS   %0, %0, %3\n"