diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-13 12:47:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-13 12:47:07 -0400 |
| commit | 7775c9753b94fe429dc4323360d6502c95e0dd6e (patch) | |
| tree | 5e89c5d2186e52591eb1945213ccb812e0411d5d /include | |
| parent | fa8d84b78be10d0c455dd716f40152bb7003bd5b (diff) | |
| parent | 42a5a8a60a093c359987fd884aec99b9d7f4c084 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: update my email address
parisc: fix miscompilation of ip_fast_csum with gcc >= 4.3
parisc: fix off by one in setup_sigcontext32
parisc: export empty_zero_page
parisc: export copy_user_page_asm
parisc: move head.S to head.text section
Revert "parisc: fix trivial section name warnings"
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-parisc/checksum.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-parisc/checksum.h b/include/asm-parisc/checksum.h index cc3ec1bd8919..e9639ccc3fce 100644 --- a/include/asm-parisc/checksum.h +++ b/include/asm-parisc/checksum.h | |||
| @@ -65,7 +65,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) | |||
| 65 | "2:\n" | 65 | "2:\n" |
| 66 | : "=r" (sum), "=r" (iph), "=r" (ihl) | 66 | : "=r" (sum), "=r" (iph), "=r" (ihl) |
| 67 | : "1" (iph), "2" (ihl) | 67 | : "1" (iph), "2" (ihl) |
| 68 | : "r19", "r20", "r21" ); | 68 | : "r19", "r20", "r21", "memory"); |
| 69 | 69 | ||
| 70 | return (__force __sum16)sum; | 70 | return (__force __sum16)sum; |
| 71 | } | 71 | } |