From 2326b353702257ca25281d1839ed7cd66437ad8d Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Wed, 4 Apr 2012 15:06:10 +0200 Subject: [PATCH] --- yaml --- r: 305895 b: refs/heads/master c: d788fec855e832ee3381d9d3afc91c9c0292e428 h: refs/heads/master i: 305893: f25e16f7ca688972d04cf822e7a70f6b5609b8e9 305891: dfbc2153a079f6fa5c3a13c390ddb9ea1abc98eb 305887: a89f2b30f88e4cc483c288b1f8c4aecae1918fc4 v: v3 --- [refs] | 2 +- trunk/crypto/xor.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7c18a5afd3ca..e2432ee62ce3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0ea0f6d17a6f14319069b039b7a9ebf54009678 +refs/heads/master: d788fec855e832ee3381d9d3afc91c9c0292e428 diff --git a/trunk/crypto/xor.c b/trunk/crypto/xor.c index b75182d8ab14..664b6dfa9e2c 100644 --- a/trunk/crypto/xor.c +++ b/trunk/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;