diff options
author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-12-11 14:23:11 +0530 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-25 11:03:46 +0100 |
commit | 3f488a9fd5c088e67b9f4865a96db0cf1d8c3790 (patch) | |
tree | 626c0938d630259d12144c2d1afc781821af2a75 | |
parent | 9adeb5b0b544bd2eddf1b1a57f89167d92fadadc (diff) | |
download | linux-stable-3f488a9fd5c088e67b9f4865a96db0cf1d8c3790.tar.gz linux-stable-3f488a9fd5c088e67b9f4865a96db0cf1d8c3790.tar.bz2 linux-stable-3f488a9fd5c088e67b9f4865a96db0cf1d8c3790.zip |
Drivers: hv: vmbus: fix build warning
commit 9220e39b5c900c67ddcb517d52fe52d90fb5e3c8 upstream.
We were getting build warning about unused variable "tsc_msr" and
"va_tsc" while building for i386 allmodconfig.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/hv/hv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index d415a804fd26..9a8976a79b29 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -195,9 +195,7 @@ int hv_init(void) { int max_leaf; union hv_x64_msr_hypercall_contents hypercall_msr; - union hv_x64_msr_hypercall_contents tsc_msr; void *virtaddr = NULL; - void *va_tsc = NULL; memset(hv_context.synic_event_page, 0, sizeof(void *) * NR_CPUS); memset(hv_context.synic_message_page, 0, @@ -243,6 +241,9 @@ int hv_init(void) #ifdef CONFIG_X86_64 if (ms_hyperv.features & HV_X64_MSR_REFERENCE_TSC_AVAILABLE) { + union hv_x64_msr_hypercall_contents tsc_msr; + void *va_tsc; + va_tsc = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL); if (!va_tsc) goto cleanup; |