diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 00:51:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 00:51:06 +0100 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /arch/blackfin/include/asm/checksum.h | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/blackfin/include/asm/checksum.h')
| -rw-r--r-- | arch/blackfin/include/asm/checksum.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/checksum.h b/arch/blackfin/include/asm/checksum.h index 6f6af2b8e9e..f67289a0d8d 100644 --- a/arch/blackfin/include/asm/checksum.h +++ b/arch/blackfin/include/asm/checksum.h @@ -78,7 +78,8 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len, "%0 = %0 + %4;\n\t" "NOP;\n\t" : "=d" (sum) - : "d" (daddr), "d" (saddr), "d" ((ntohs(len)<<16)+proto*256), "d" (1), "0"(sum)); + : "d" (daddr), "d" (saddr), "d" ((ntohs(len)<<16)+proto*256), "d" (1), "0"(sum) + : "CC"); return (sum); } |