linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] crypto: hide unused label
@ 2016-08-29 12:40 Arnd Bergmann
  2016-08-31 14:37 ` Herbert Xu
  0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2016-08-29 12:40 UTC (permalink / raw)
  To: Herbert Xu
  Cc: Arnd Bergmann, David S. Miller, Martin Schwidefsky, linux-crypto,
	linux-kernel

A recent change left an existing label unused in some configurations,
as seen from a gcc warning:

crypto/xor.c: In function 'calibrate_xor_blocks':
crypto/xor.c:156:1: error: label 'out' defined but not used [-Werror=unused-label]

This adds an #ifdef around it to match the one around the respective "goto".

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 39457acda913 ("crypto: xor - skip speed test if the xor function is selected automatically")
---
v2: add proper changelog, sorry for missing that at first.
---
 crypto/xor.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/xor.c b/crypto/xor.c
index b8975d92cd94..1817015381ef 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -153,7 +153,9 @@ calibrate_xor_blocks(void)
 #undef xor_speed
 
 	free_pages((unsigned long)b1, 2);
+#ifdef XOR_SELECT_TEMPLATE
 out:
+#endif
 	active_template = fastest;
 	return 0;
 }
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] crypto: hide unused label
  2016-08-29 12:40 [PATCH v2] crypto: hide unused label Arnd Bergmann
@ 2016-08-31 14:37 ` Herbert Xu
  2016-08-31 14:43   ` Arnd Bergmann
  0 siblings, 1 reply; 3+ messages in thread
From: Herbert Xu @ 2016-08-31 14:37 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: David S. Miller, Martin Schwidefsky, linux-crypto, linux-kernel

On Mon, Aug 29, 2016 at 02:40:43PM +0200, Arnd Bergmann wrote:
> A recent change left an existing label unused in some configurations,
> as seen from a gcc warning:
> 
> crypto/xor.c: In function 'calibrate_xor_blocks':
> crypto/xor.c:156:1: error: label 'out' defined but not used [-Werror=unused-label]
> 
> This adds an #ifdef around it to match the one around the respective "goto".
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 39457acda913 ("crypto: xor - skip speed test if the xor function is selected automatically")

Thanks for the patch.  But I've already queued up a fix at

https://patchwork.kernel.org/patch/9301603/
-- 
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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] crypto: hide unused label
  2016-08-31 14:37 ` Herbert Xu
@ 2016-08-31 14:43   ` Arnd Bergmann
  0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2016-08-31 14:43 UTC (permalink / raw)
  To: Herbert Xu
  Cc: David S. Miller, Martin Schwidefsky, linux-crypto, linux-kernel

On Wednesday, August 31, 2016 10:37:52 PM CEST Herbert Xu wrote:
> On Mon, Aug 29, 2016 at 02:40:43PM +0200, Arnd Bergmann wrote:
> > A recent change left an existing label unused in some configurations,
> > as seen from a gcc warning:
> > 
> > crypto/xor.c: In function 'calibrate_xor_blocks':
> > crypto/xor.c:156:1: error: label 'out' defined but not used [-Werror=unused-label]
> > 
> > This adds an #ifdef around it to match the one around the respective "goto".
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Fixes: 39457acda913 ("crypto: xor - skip speed test if the xor function is selected automatically")
> 
> Thanks for the patch.  But I've already queued up a fix at
> 
> https://patchwork.kernel.org/patch/9301603/
> 

Ok, that one looks like a nicer solution anyway.

	Arnd

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-08-31 14:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-29 12:40 [PATCH v2] crypto: hide unused label Arnd Bergmann
2016-08-31 14:37 ` Herbert Xu
2016-08-31 14:43   ` Arnd Bergmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).