summaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/checksum.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 17:36:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 17:36:46 -0700
commit826509f8110049663799bc20f2b5b6170e2f78ca (patch)
tree9d8823cf283592625b882125b4b13988f2934cc6 /include/asm-x86_64/checksum.h
parentd992895ba2b27cf5adf1ba0ad6d27662adc54c5e (diff)
parentc530cfb1ce1e8f230744c3f3bd86771f50725053 (diff)
downloadop-kernel-dev-826509f8110049663799bc20f2b5b6170e2f78ca.zip
op-kernel-dev-826509f8110049663799bc20f2b5b6170e2f78ca.tar.gz
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
Diffstat (limited to 'include/asm-x86_64/checksum.h')
-rw-r--r--include/asm-x86_64/checksum.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/checksum.h b/include/asm-x86_64/checksum.h
index d01356f..989469e 100644
--- a/include/asm-x86_64/checksum.h
+++ b/include/asm-x86_64/checksum.h
@@ -64,7 +64,7 @@ static inline unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl)
" adcl $0, %0\n"
" notl %0\n"
"2:"
- /* Since the input registers which are loaded with iph and ipl
+ /* Since the input registers which are loaded with iph and ihl
are modified, we must also specify them as outputs, or gcc
will assume they contain their original values. */
: "=r" (sum), "=r" (iph), "=r" (ihl)
OpenPOWER on IntegriCloud