Merge branch 'linus' into core/printk

[linux-2.6] / include / asm-sh / checksum_32.h

diff --git a/include/asm-sh/checksum_32.h b/include/asm-sh/checksum_32.h
index 4bc8357e8892c65e8cf586de88fee3d3ef9acc78..14b7ac2f0a07a7e187fed823712ac74319785a65 100644 (file)
--- a/include/asm-sh/checksum_32.h
+++ b/include/asm-sh/checksum_32.h
@@ -109,7 +109,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
           will assume they contain their original values. */
        : "=r" (sum), "=r" (iph), "=r" (ihl), "=&r" (__dummy0), "=&z" (__dummy1)
        : "1" (iph), "2" (ihl)
-       : "t");
+       : "t", "memory");
 
        return  csum_fold(sum);
 }