From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756296AbcHYJXN (ORCPT ); Thu, 25 Aug 2016 05:23:13 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:53682 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932334AbcHYJXK (ORCPT ); Thu, 25 Aug 2016 05:23:10 -0400 X-IBM-Helo: d06dlp02.portsmouth.uk.ibm.com X-IBM-MailFrom: schwidefsky@de.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org;linux-next@vger.kernel.org Date: Thu, 25 Aug 2016 08:20:10 +0200 From: Martin Schwidefsky To: Stephen Rothwell Cc: Herbert Xu , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: build warning after merge of the crypto tree In-Reply-To: <20160825113824.61ca7364@canb.auug.org.au> References: <20160825113824.61ca7364@canb.auug.org.au> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16082506-0020-0000-0000-000002376FF8 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16082506-0021-0000-0000-00003DC0FE83 Message-Id: <20160825082010.5523ae6f@mschwide> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-08-25_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1608250070 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 25 Aug 2016 11:38:24 +1000 Stephen Rothwell 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.