aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTom Herbert <therbert@google.com>2014-05-02 16:28:40 -0700
committerDavid S. Miller <davem@davemloft.net>2014-05-05 15:26:29 -0400
commit4405b4d635aa2c5c7eb8873696b54811531e0d08 (patch)
tree4238c40c31fea0f3e7bfb84dd9f027cf9572cb7f /arch
parentx86_64: csum_add for x86_64 (diff)
downloadlinux-dev-4405b4d635aa2c5c7eb8873696b54811531e0d08.tar.xz
linux-dev-4405b4d635aa2c5c7eb8873696b54811531e0d08.zip
net: Change x86_64 add32_with_carry to allow memory operand
Note add32_with_carry(a, b) is suboptimal, as it forces a and b in registers. b could be a memory or a register operand. Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/checksum_64.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/checksum_64.h b/arch/x86/include/asm/checksum_64.h
index 3581761bd86c..cd00e1774491 100644
--- a/arch/x86/include/asm/checksum_64.h
+++ b/arch/x86/include/asm/checksum_64.h
@@ -184,7 +184,7 @@ static inline unsigned add32_with_carry(unsigned a, unsigned b)
asm("addl %2,%0\n\t"
"adcl $0,%0"
: "=r" (a)
- : "0" (a), "r" (b));
+ : "0" (a), "rm" (b));
return a;
}