Commit 73667e31 authored Feb 14, 2017 by Arnd Bergmann Committed by Thomas Gleixner Mar 01, 2017

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: dee863b5 ("hv: export current Hyper-V clocksource")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Stephen Hemminger <sthemmin@microsoft.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: devel@linuxdriverproject.org
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Link: http://lkml.kernel.org/r/20170214211736.2641241-1-arnd@arndb.de


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 90b28ded

arch/x86/hyperv/hv_init.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);