summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-08-26 23:19:39 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2016-08-31 23:00:48 +0800
commit27c4d548af958233e26ab5b00719ff3e49b3aebe (patch)
tree5dc99b2e6d9f4e3837e3abfcdf5f67bb10346c67 /crypto
parent85962d2248fae84ffaa04f09826596d20af56819 (diff)
downloadlinux-stable-27c4d548af958233e26ab5b00719ff3e49b3aebe.tar.gz
linux-stable-27c4d548af958233e26ab5b00719ff3e49b3aebe.tar.bz2
linux-stable-27c4d548af958233e26ab5b00719ff3e49b3aebe.zip
crypto: xor - Fix warning when XOR_SELECT_TEMPLATE is unset
This patch fixes an unused label warning triggered when the macro XOR_SELECT_TEMPLATE is not set. Fixes: 39457acda913 ("crypto: xor - skip speed test if the xor...") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Suggested-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/xor.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/xor.c b/crypto/xor.c
index b8975d92cd94..263af9fb45ea 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -24,6 +24,10 @@
#include <linux/preempt.h>
#include <asm/xor.h>
+#ifndef XOR_SELECT_TEMPLATE
+#define XOR_SELECT_TEMPLATE(x) (x)
+#endif
+
/* The xor routines to use. */
static struct xor_block_template *active_template;
@@ -109,17 +113,14 @@ calibrate_xor_blocks(void)
void *b1, *b2;
struct xor_block_template *f, *fastest;
- fastest = NULL;
+ fastest = XOR_SELECT_TEMPLATE(NULL);
-#ifdef XOR_SELECT_TEMPLATE
- fastest = XOR_SELECT_TEMPLATE(fastest);
if (fastest) {
printk(KERN_INFO "xor: automatically using best "
"checksumming function %-10s\n",
fastest->name);
goto out;
}
-#endif
/*
* Note: Since the memory is not actually used for _anything_ but to