Commit 583243c0 authored by Linus Torvalds's avatar Linus Torvalds

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.
parents 719d9699 51bcf092
...@@ -151,7 +151,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) ...@@ -151,7 +151,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
"xnor\t%%g0, %0, %0" "xnor\t%%g0, %0, %0"
: "=r" (sum), "=&r" (iph) : "=r" (sum), "=&r" (iph)
: "r" (ihl), "1" (iph) : "r" (ihl), "1" (iph)
: "g2", "g3", "g4", "cc"); : "g2", "g3", "g4", "cc", "memory");
return sum; return sum;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment