summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-02 08:10:17 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-02 08:10:17 -0800
commit583243c062dae7092890d6fb803958e36da98838 (patch)
tree57f48a01f4ad8f3c33ea5977408bb1da41b90abd
parent719d96991ac8d96ea318c6d56500e7ed690a4ac0 (diff)
parent51bcf092917bfaa88d762879d0bbfe7619e8c16c (diff)
downloadlinux-sh-583243c062dae7092890d6fb803958e36da98838.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC32]: Fix over-optimization by GCC near ip_fast_csum.
-rw-r--r--include/asm-sparc/checksum.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/checksum.h b/include/asm-sparc/checksum.h
index 267e631e9bbc..34518ea7bf1b 100644
--- a/include/asm-sparc/checksum.h
+++ b/include/asm-sparc/checksum.h
@@ -151,7 +151,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
"xnor\t%%g0, %0, %0"
: "=r" (sum), "=&r" (iph)
: "r" (ihl), "1" (iph)
- : "g2", "g3", "g4", "cc");
+ : "g2", "g3", "g4", "cc", "memory");
return sum;
}