[PATCH] kvm/x86: Fix unused variable warning in kvm_timer_init()

From: Borislav Petkov
Date: Sun Sep 04 2016 - 13:14:05 EST


From: Borislav Petkov <bp@xxxxxxx>

When CONFIG_CPU_FREQ is not set, int cpu is unused and gcc rightfully
warns about it:

arch/x86/kvm/x86.c: In function âkvm_timer_initâ:
arch/x86/kvm/x86.c:5697:6: warning: unused variable âcpuâ [-Wunused-variable]
int cpu;
^~~

But since it is used only in the CONFIG_CPU_FREQ block, simply move it
there, thus squashing the warning too.

Signed-off-by: Borislav Petkov <bp@xxxxxxx>
---
arch/x86/kvm/x86.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 19f9f9e05c2a..30bff0c1357a 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5694,13 +5694,13 @@ static int kvmclock_cpu_online(unsigned int cpu)

static void kvm_timer_init(void)
{
- int cpu;
-
max_tsc_khz = tsc_khz;

if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) {
#ifdef CONFIG_CPU_FREQ
struct cpufreq_policy policy;
+ int cpu;
+
memset(&policy, 0, sizeof(policy));
cpu = get_cpu();
cpufreq_get_policy(&policy, cpu);
--
2.10.0