Skip to contentSkip to conversation

x86: hyperv: Fix a compilation warning

PATCH In review K. Y. Srinivasan 2 participants 2 messages Oct 11, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: hyperv: Fix a compilation warning

The variable hv_lapic_frequency is only used when CONFIG_X86_LOCAL_APIC is defined. Make the necessary adjustment.

---
 arch/x86/kernel/cpu/mshyperv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/mshyperv.c +1 -1
index 628ff50..d7ff7b8 100644
@@ -69,7 +69,6 @@ static struct clocksource hyperv_cs = {
 
 static void __init ms_hyperv_init_platform(void)
 {
-	u64	hv_lapic_frequency;
 
 	/*
 	 * Extract the features and hints
@@ -82,6 +81,7 @@ static void __init ms_hyperv_init_platform(void)
 
 #ifdef CONFIG_X86_LOCAL_APIC
 	if (ms_hyperv.features & HV_X64_MSR_APIC_FREQUENCY_AVAILABLE) {
+		u64	hv_lapic_frequency;
 		/*
 		 * Get the APIC frequency.
 		 */
Signature · 1 line
1.7.4.1
#1 lore raw

No real reason to do this.

Quoted 29 lines · K. Y. Srinivasan

The variable hv_lapic_frequency is only used when CONFIG_X86_LOCAL_APIC is defined. Make the necessary adjustment.

---
arch/x86/kernel/cpu/mshyperv.c | 2 +-

1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/mshyperv.c +1 -1
index 628ff50..d7ff7b8 100644
@@ -69,7 +69,6 @@ static struct clocksource hyperv_cs = {
 
 static void __init ms_hyperv_init_platform(void)
 {
-	u64	hv_lapic_frequency;
 
 	/*
 	 * Extract the features and hints
@@ -82,6 +81,7 @@ static void __init ms_hyperv_init_platform(void)
 
 #ifdef CONFIG_X86_LOCAL_APIC
 	if (ms_hyperv.features & HV_X64_MSR_APIC_FREQUENCY_AVAILABLE) {
+		u64	hv_lapic_frequency;
 		/*
 		 * Get the APIC frequency.
 		 */
Signature · 1 line
Sent from my mobile phone.  Please pardon brevity and lack of formatting.