diff --git a/[refs] b/[refs] index 23fea199c1d9..5f358c021b1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35e71f90687fd904b43e3427673827ac3e77b4d1 +refs/heads/master: 7dbe5c542464a511f0ea6a14e3ff08874d7e21d5 diff --git a/trunk/arch/xtensa/include/asm/checksum.h b/trunk/arch/xtensa/include/asm/checksum.h index f84d3f00774a..e4d831a30772 100644 --- a/trunk/arch/xtensa/include/asm/checksum.h +++ b/trunk/arch/xtensa/include/asm/checksum.h @@ -113,7 +113,8 @@ static __inline__ __sum16 ip_fast_csum(const void *iph, unsigned int ihl) are modified, we must also specify them as outputs, or gcc will assume they contain their original values. */ : "=r" (sum), "=r" (iph), "=r" (ihl), "=&r" (tmp), "=&r" (endaddr) - : "1" (iph), "2" (ihl)); + : "1" (iph), "2" (ihl) + : "memory"); return csum_fold(sum); } @@ -227,7 +228,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, "1:\t" : "=r" (sum), "=&r" (__dummy) : "r" (saddr), "r" (daddr), - "r" (htonl(len)), "r" (htonl(proto)), "0" (sum)); + "r" (htonl(len)), "r" (htonl(proto)), "0" (sum) + : "memory"); return csum_fold(sum); }