Commit-ID: 4c08edd305019061bf1ac95ce089497bdbb8b8ac
Gitweb: http://git.kernel.org/tip/4c08edd305019061bf1ac95ce089497bdbb8b8ac
Author: H. Peter Anvin <hpa@xxxxxxxxx>
AuthorDate: Wed, 6 Nov 2013 10:00:05 -0800
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
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.
Cc: K. Y. Srinivasan <kys@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1381444224-3303-1-git-send-email-kys@xxxxxxxxxxxxx
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
---
arch/x86/kernel/cpu/mshyperv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index 9f6e9f8..9f7ca26 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -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;
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|