diff options
| author | Borislav Petkov | 2016-09-04 19:13:57 +0200 |
|---|---|---|
| committer | Radim Krčmář | 2016-10-20 14:49:52 +0200 |
| commit | 758f588d6fa2b1e64b6ae4bc4e7e86331bdee479 (patch) | |
| tree | aa7e9dce452dd1df1a7ad49dce5efc1c5d2503bf /arch/x86 | |
| parent | Linux 4.9-rc1 (diff) | |
| download | kernel-qcow2-linux-758f588d6fa2b1e64b6ae4bc4e7e86331bdee479.tar.gz kernel-qcow2-linux-758f588d6fa2b1e64b6ae4bc4e7e86331bdee479.tar.xz kernel-qcow2-linux-758f588d6fa2b1e64b6ae4bc4e7e86331bdee479.zip | |
kvm/x86: Fix unused variable warning in kvm_timer_init()
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@suse.de>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 6c633de84dd7..e375235d81c9 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5733,13 +5733,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); |