From d2302f285cf194b94a453f730eb5fcfff7d90212 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 30 Sep 2009 16:19:39 -0700 Subject: [PATCH] --- yaml --- r: 166884 b: refs/heads/master c: d1716a60a8ea90788d24aa22d7eec83fbdd2d88a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/checksum_32.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2ec818132cc8..ebcf0cdd578d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 982d007a6eec4a0abb404d2355eeec2c041c61ea +refs/heads/master: d1716a60a8ea90788d24aa22d7eec83fbdd2d88a diff --git a/trunk/arch/x86/include/asm/checksum_32.h b/trunk/arch/x86/include/asm/checksum_32.h index 7c5ef8b14d92..46fc474fd819 100644 --- a/trunk/arch/x86/include/asm/checksum_32.h +++ b/trunk/arch/x86/include/asm/checksum_32.h @@ -161,7 +161,8 @@ static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, "adcl $0, %0 ;\n" : "=&r" (sum) : "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); }