diff options
author | 2008-07-18 19:53:16 +0200 | |
---|---|---|
committer | 2008-07-18 19:53:16 +0200 | |
commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /include/asm-sh/checksum_32.h | |
parent | nohz: prevent tick stop outside of the idle loop (diff) | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 (diff) | |
download | linux-dev-9b610fda0df5d0f0b0c64242e37441ad1b384aac.tar.xz linux-dev-9b610fda0df5d0f0b0c64242e37441ad1b384aac.zip |
Merge branch 'linus' into timers/nohz
Diffstat (limited to 'include/asm-sh/checksum_32.h')
-rw-r--r-- | include/asm-sh/checksum_32.h | 2 |
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) 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); } |