X86: hypev: Correctly guard the local APIC calibration code.
Subsystems (2)
PATCH 1/1 X86: hypev: Correctly guard the local APIC calibration code.
Correctly guard the code that gets the local APIC timer frequency from the hypervisor.
--- arch/x86/kernel/cpu/mshyperv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/mshyperv.c +2 -0
@@ -80,6 +80,7 @@ static void __init ms_hyperv_init_platform(void)printk (KERN_INFO "HyperV: features 0x%x, hints 0x%x\n" , ms_hyperv.features, ms_hyperv.hints); +#ifdef CONFIG_X86_LOCAL_APIC if (ms_hyperv.features &HV_X64_MSR_APIC_FREQUENCY_AVAILABLE ) {/* * Get the APIC frequency.
@@ -99,6 +100,7 @@ static void __init ms_hyperv_init_platform(void) legacy_pic = &null_legacy_pic; } } +#endif if (ms_hyperv.features &HV_X64_MSR_TIME_REF_COUNT_AVAILABLE )clocksource_register_hz (&hyperv_cs,NSEC_PER_SEC /100 );
Signature · 1 line
1.7.4.1
tip-bot for K. Y. Srinivasan
merge bot[tip:x86/hyperv] x86, hyperv: Correctly guard the local APIC calibration code
x86, hyperv: Correctly guard the local APIC calibration code
Commit-ID: 90ab9d5510932e146a9443bf5a591f95d5b5ada8 Gitweb: http://git.kernel.org/tip/90ab9d5510932e146a9443bf5a591f95d5b5ada8 Author: K. Y. Srinivasan <[email protected]> AuthorDate: Thu, 10 Oct 2013 15:30:24 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 10 Oct 2013 15:21:38 -0700
x86, hyperv: Correctly guard the local APIC calibration code
The code that gets the local APIC timer frequency from the hypervisor rather depends on there being a local APIC.
--- arch/x86/kernel/cpu/mshyperv.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/cpu/mshyperv.c +2 -0
@@ -80,6 +80,7 @@ static void __init ms_hyperv_init_platform(void)printk (KERN_INFO "HyperV: features 0x%x, hints 0x%x\n" , ms_hyperv.features, ms_hyperv.hints); +#ifdef CONFIG_X86_LOCAL_APIC if (ms_hyperv.features &HV_X64_MSR_APIC_FREQUENCY_AVAILABLE ) {/* * Get the APIC frequency.
@@ -99,6 +100,7 @@ static void __init ms_hyperv_init_platform(void) legacy_pic = &null_legacy_pic; } } +#endif if (ms_hyperv.features &HV_X64_MSR_TIME_REF_COUNT_AVAILABLE )clocksource_register_hz (&hyperv_cs,NSEC_PER_SEC /100 );
tip-bot for H. Peter Anvin
merge bot[tip:x86/hyperv] x86, hyperv: Move a variable to avoid an unused variable warning
In reply to K. Y. Srinivasanx86, hyperv: Move a variable to avoid an unused variable warning
Commit-ID: 4c08edd305019061bf1ac95ce089497bdbb8b8ac Gitweb: http://git.kernel.org/tip/4c08edd305019061bf1ac95ce089497bdbb8b8ac Author: H. Peter Anvin <[email protected]> AuthorDate: Wed, 6 Nov 2013 10:00:05 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Wed, 6 Nov 2013 10:02:05 -0800
x86, hyperv: Move a variable to avoid an unused variable warning
The variable hv_lapic_frequency causes an unused variable warning if CONFIG_X86_LOCAL_APIC is disabled. Since the variable is only used inside a small if statement, move the declaration of that variable into the if statement itself.
--- arch/x86/kernel/cpu/mshyperv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mshyperv.c +2 -2
@@ -70,8 +70,6 @@ static struct clocksource hyperv_cs = {static void __init ms_hyperv_init_platform (void ) { -u64 hv_lapic_frequency; -/* * Extract the features and hints */
@@ -86,6 +84,8 @@ static void __init ms_hyperv_init_platform(void)/* * Get the APIC frequency. */ +u64 hv_lapic_frequency; +rdmsrl (HV_X64_MSR_APIC_FREQUENCY , hv_lapic_frequency); hv_lapic_frequency =div_u64 (hv_lapic_frequency,HZ ); lapic_timer_frequency = hv_lapic_frequency;