From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752407AbdCAKnY (ORCPT ); Wed, 1 Mar 2017 05:43:24 -0500 Received: from terminus.zytor.com ([65.50.211.136]:48460 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752576AbdCAKnT (ORCPT ); Wed, 1 Mar 2017 05:43:19 -0500 Date: Wed, 1 Mar 2017 01:54:51 -0800 From: tip-bot for Arnd Bergmann Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, haiyangz@microsoft.com, tglx@linutronix.de, arnd@arndb.de, sthemmin@microsoft.com, vkuznets@redhat.com, hpa@zytor.com, gregkh@linuxfoundation.org, kys@microsoft.com Reply-To: kys@microsoft.com, gregkh@linuxfoundation.org, hpa@zytor.com, tglx@linutronix.de, vkuznets@redhat.com, sthemmin@microsoft.com, arnd@arndb.de, mingo@kernel.org, linux-kernel@vger.kernel.org, haiyangz@microsoft.com In-Reply-To: <20170214211736.2641241-1-arnd@arndb.de> References: <20170214211736.2641241-1-arnd@arndb.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/hyperv: Hide unused label Git-Commit-ID: 73667e31a153a66da97feb1584726222504924f8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 73667e31a153a66da97feb1584726222504924f8 Gitweb: http://git.kernel.org/tip/73667e31a153a66da97feb1584726222504924f8 Author: Arnd Bergmann AuthorDate: Tue, 14 Feb 2017 22:17:17 +0100 Committer: Thomas Gleixner CommitDate: Wed, 1 Mar 2017 10:51:40 +0100 x86/hyperv: Hide unused label This new 32-bit warning just showed up: arch/x86/hyperv/hv_init.c: In function 'hyperv_init': arch/x86/hyperv/hv_init.c:167:1: error: label 'register_msr_cs' defined but not used [-Werror=unused-label] The easiest solution is to move the label up into the existing #ifdef that has the goto. Fixes: dee863b571b0 ("hv: export current Hyper-V clocksource") Signed-off-by: Arnd Bergmann Acked-by: Stephen Hemminger Cc: Greg Kroah-Hartman Cc: Haiyang Zhang Cc: devel@linuxdriverproject.org Cc: Vitaly Kuznetsov Cc: "K. Y. Srinivasan" Link: http://lkml.kernel.org/r/20170214211736.2641241-1-arnd@arndb.de Signed-off-by: Thomas Gleixner --- arch/x86/hyperv/hv_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index db64baf0..8bef70e 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -158,13 +158,13 @@ void hyperv_init(void) clocksource_register_hz(&hyperv_cs_tsc, NSEC_PER_SEC/100); return; } +register_msr_cs: #endif /* * For 32 bit guests just use the MSR based mechanism for reading * the partition counter. */ -register_msr_cs: hyperv_cs = &hyperv_cs_msr; if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE) clocksource_register_hz(&hyperv_cs_msr, NSEC_PER_SEC/100);