summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2012-04-04 15:06:10 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2012-04-09 09:21:16 +0200
commitd788fec855e832ee3381d9d3afc91c9c0292e428 (patch)
tree7c88335e3d097d43320128a931d5682c079fc06b /crypto
parentcrypto: caam - add backward compatible string sec4.0 (diff)
downloadlinux-d788fec855e832ee3381d9d3afc91c9c0292e428.tar.xz
linux-d788fec855e832ee3381d9d3afc91c9c0292e428.zip
crypto, xor: Sanitize checksumming function selection output
Currently, it says [ 1.015541] xor: automatically using best checksumming function: generic_sse [ 1.040769] generic_sse: 6679.000 MB/sec [ 1.045377] xor: using function: generic_sse (6679.000 MB/sec) and repeats the function name three times unnecessarily. Change it into [ 1.015115] xor: automatically using best checksumming function: [ 1.040794] generic_sse: 6680.000 MB/sec and save us a line in dmesg. No functional change. Cc: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Borislav Petkov <borislav.petkov@amd.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/xor.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/xor.c b/crypto/xor.c
index b75182d8ab14..664b6dfa9e2c 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -129,9 +129,9 @@ calibrate_xor_blocks(void)
if (fastest) {
printk(KERN_INFO "xor: automatically using best "
- "checksumming function: %s\n",
- fastest->name);
+ "checksumming function:\n");
xor_speed(fastest);
+ goto out;
} else {
printk(KERN_INFO "xor: measuring software checksum speed\n");
XOR_TRY_TEMPLATES;
@@ -146,6 +146,7 @@ calibrate_xor_blocks(void)
#undef xor_speed
+ out:
free_pages((unsigned long)b1, 2);
active_template = fastest;