aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-04 11:35:44 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-04 11:35:44 -0400
commitdf6ab559bb1be44a78584e78ae7ad82d4e9e4f51 (patch)
treef233d0586352b958a0a33ce0e23df95c13d09f40 /include
parent3b5b60b821e0e97531df9b0ba295283ab5a8859a (diff)
parent39eb41ef0732a02acb3babe5ba1df92d76b9fb8f (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26: sh: Add defconfig for RSK7203. sh: Update SE7206 defconfig. sh: Disable 4KSTACKS on nommu. sh: fix miscompilation of ip_fast_csum with gcc >= 4.3 sh: module.c use kernel unaligned helpers sh/kernel/cpu/irq/intc-sh5.c build fix
Diffstat (limited to 'include')
-rw-r--r--include/asm-sh/checksum_32.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/checksum_32.h b/include/asm-sh/checksum_32.h
index 4bc8357e8892..14b7ac2f0a07 100644
--- 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)
109 will assume they contain their original values. */ 109 will assume they contain their original values. */
110 : "=r" (sum), "=r" (iph), "=r" (ihl), "=&r" (__dummy0), "=&z" (__dummy1) 110 : "=r" (sum), "=r" (iph), "=r" (ihl), "=&r" (__dummy0), "=&z" (__dummy1)
111 : "1" (iph), "2" (ihl) 111 : "1" (iph), "2" (ihl)
112 : "t"); 112 : "t", "memory");
113 113
114 return csum_fold(sum); 114 return csum_fold(sum);
115} 115}