lkml.org 
[lkml]   [2016]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: linux-next: build warning after merge of the crypto tree
On Thu, Aug 25, 2016 at 08:20:10AM +0200, Martin Schwidefsky wrote:
> On Thu, 25 Aug 2016 11:38:24 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi Herbert,
> >
> > After merging the crypto tree, today's linux-next build (powerpc
> > ppc64_defconfig) produced this warning:
> >
> > crypto/xor.c: In function 'calibrate_xor_blocks':
> > crypto/xor.c:156:1: warning: label 'out' defined but not used [-Wunused-label]
> > out:
> > ^
> >
> > Introduced by commit
> >
> > 39457acda913 ("crypto: xor - skip speed test if the xor function is selected automatically")
> >
> > This build does not have XOR_SELECT_TEMPLATE set.
>
> Hmm, this is probably the best option to get rid of the warning:

I'm going to do something like this:

---8<---
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>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/xor.c b/crypto/xor.c
index b8975d9..69866e9 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -113,13 +113,14 @@ calibrate_xor_blocks(void)

#ifdef XOR_SELECT_TEMPLATE
fastest = XOR_SELECT_TEMPLATE(fastest);
+#endif
+
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
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

\
 
 \ /
  Last update: 2016-09-17 09:57    [W:0.059 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site