diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /include/asm-mips/checksum.h | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'include/asm-mips/checksum.h')
| -rw-r--r-- | include/asm-mips/checksum.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/checksum.h b/include/asm-mips/checksum.h index c25cc92b9950..c1ea5a8714f3 100644 --- a/include/asm-mips/checksum.h +++ b/include/asm-mips/checksum.h | |||
| @@ -128,7 +128,7 @@ static inline unsigned int csum_tcpudp_nofold(unsigned long saddr, | |||
| 128 | { | 128 | { |
| 129 | __asm__( | 129 | __asm__( |
| 130 | ".set\tnoat\t\t\t# csum_tcpudp_nofold\n\t" | 130 | ".set\tnoat\t\t\t# csum_tcpudp_nofold\n\t" |
| 131 | #ifdef CONFIG_MIPS32 | 131 | #ifdef CONFIG_32BIT |
| 132 | "addu\t%0, %2\n\t" | 132 | "addu\t%0, %2\n\t" |
| 133 | "sltu\t$1, %0, %2\n\t" | 133 | "sltu\t$1, %0, %2\n\t" |
| 134 | "addu\t%0, $1\n\t" | 134 | "addu\t%0, $1\n\t" |
| @@ -141,7 +141,7 @@ static inline unsigned int csum_tcpudp_nofold(unsigned long saddr, | |||
| 141 | "sltu\t$1, %0, %4\n\t" | 141 | "sltu\t$1, %0, %4\n\t" |
| 142 | "addu\t%0, $1\n\t" | 142 | "addu\t%0, $1\n\t" |
| 143 | #endif | 143 | #endif |
| 144 | #ifdef CONFIG_MIPS64 | 144 | #ifdef CONFIG_64BIT |
| 145 | "daddu\t%0, %2\n\t" | 145 | "daddu\t%0, %2\n\t" |
| 146 | "daddu\t%0, %3\n\t" | 146 | "daddu\t%0, %3\n\t" |
| 147 | "daddu\t%0, %4\n\t" | 147 | "daddu\t%0, %4\n\t" |