diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /include/asm-parisc | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'include/asm-parisc')
| -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 | } |