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.

include/asm-sparc/checksum.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}