hv: hide unused label
Subsystems (2)
PATCH 1/1 hv: 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.
--- arch/x86/hyperv/hv_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/hyperv/hv_init.c +1 -1
@@ -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 );
Signature · 1 line
2.9.0
Quoted 10 lines · On Tue, 14 Feb 2017 22:17:17 +0100 Arnd Bergmann <[email protected]> wrote:
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 <[email protected]>
Quoted 20 lines · Arnd Bergmann
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 <[email protected]>--- arch/x86/hyperv/hv_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/hyperv/hv_init.c +0
-0@@ -158,13 +158,13 @@ void hyperv_init(void)clocksource_register_hz (&hyperv_cs_tsc,NSEC_PER_SEC /100 );
arch/x86/hyperv/hv_init.c void hyperv_init(void) · line 167
Quoted 10 lines
arch/x86/hyperv/hv_init.c +1
-1return ; } +register_msr_cs:#endif /* * For 32 bit guests just use the MSR based mechanism for reading * the partition counter. */ -register_msr_cs:
Now the warning triggers upstream:
arch/x86/hyperv/hv_init.c: In function ‘hyperv_init’:
arch/x86/hyperv/hv_init.c:167:1: warning: label ‘register_msr_cs’ defined but not used [-Wunused-label]
Thanks,
Ingo
tip-bot for Arnd Bergmann
merge bot[tip:x86/urgent] x86/hyperv: Hide unused label
In reply to Arnd Bergmannx86/hyperv: Hide unused label
Commit-ID: 73667e31a153a66da97feb1584726222504924f8 Gitweb: http://git.kernel.org/tip/73667e31a153a66da97feb1584726222504924f8 Author: Arnd Bergmann <[email protected]> AuthorDate: Tue, 14 Feb 2017 22:17:17 +0100 Committer: Thomas Gleixner <[email protected]> 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.
--- arch/x86/hyperv/hv_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/hyperv/hv_init.c +1 -1
@@ -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 );