From c0df183585c2f69daab40f211c412f8737e69086 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 1 Oct 2009 15:44:02 -0700 Subject: [PATCH] --- yaml --- r: 166643 b: refs/heads/master c: 392d814daf460a9564d29b2cebc51e1ea34e0504 h: refs/heads/master i: 166641: b90c3d64fd1105b810f44822d488dcd0dfc1b7a7 166639: b9bcf4882c2d54ccef5809aade7600bf8bdbb9a1 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 a021b9f63487..acb23d1a8079 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d22a001bf6a502e978a8617e3f297b4d762cfbb5 +refs/heads/master: 392d814daf460a9564d29b2cebc51e1ea34e0504 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); }