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, 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:
--
diff --git a/crypto/xor.c b/crypto/xor.c
index b8975d9..f00edfc 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -117,7 +117,8 @@ calibrate_xor_blocks(void)
printk(KERN_INFO "xor: automatically using best "
"checksumming function %-10s\n",
fastest->name);
- goto out;
+ active_template = fastest;
+ return 0;
}
#endif

@@ -153,7 +154,6 @@ calibrate_xor_blocks(void)
#undef xor_speed

free_pages((unsigned long)b1, 2);
-out:
active_template = fastest;
return 0;
}
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.

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