diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/lib/csum-partial_64.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/lib/csum-partial_64.c')
| -rw-r--r-- | arch/x86/lib/csum-partial_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/csum-partial_64.c b/arch/x86/lib/csum-partial_64.c index bf51144d97e1..9845371c5c36 100644 --- a/arch/x86/lib/csum-partial_64.c +++ b/arch/x86/lib/csum-partial_64.c | |||
| @@ -84,7 +84,7 @@ static unsigned do_csum(const unsigned char *buff, unsigned len) | |||
| 84 | count64--; | 84 | count64--; |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | /* last upto 7 8byte blocks */ | 87 | /* last up to 7 8byte blocks */ |
| 88 | count %= 8; | 88 | count %= 8; |
| 89 | while (count) { | 89 | while (count) { |
| 90 | asm("addq %1,%0\n\t" | 90 | asm("addq %1,%0\n\t" |