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 /crypto/vmac.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 'crypto/vmac.c')
-rw-r--r-- | crypto/vmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/vmac.c b/crypto/vmac.c index 0999274a27ac..f35ff8a3926e 100644 --- a/crypto/vmac.c +++ b/crypto/vmac.c | |||
@@ -95,7 +95,7 @@ const u64 mpoly = UINT64_C(0x1fffffff1fffffff); /* Poly key mask */ | |||
95 | 95 | ||
96 | /* | 96 | /* |
97 | * For highest performance the L1 NH and L2 polynomial hashes should be | 97 | * For highest performance the L1 NH and L2 polynomial hashes should be |
98 | * carefully implemented to take advantage of one's target architechture. | 98 | * carefully implemented to take advantage of one's target architecture. |
99 | * Here these two hash functions are defined multiple time; once for | 99 | * Here these two hash functions are defined multiple time; once for |
100 | * 64-bit architectures, once for 32-bit SSE2 architectures, and once | 100 | * 64-bit architectures, once for 32-bit SSE2 architectures, and once |
101 | * for the rest (32-bit) architectures. | 101 | * for the rest (32-bit) architectures. |