renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-25 23:26:03 +08:00
Code

x86, kvm: Fix intialization warnings in kvm.c

Browse Source 
With commit:

  4cca6ea04d ("x86/apic: Allow x2apic without IR on VMware platform")

we started seeing "incompatible initialization" warning messages,
since x2apic_available() expects a bool return type while
kvm_para_available() returns an int.

Reported by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Alok N Kataria <akataria@vmware.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Alok N Kataria 2013-01-28 18:59:12 -08:00 committed by Ingo Molnar
parent 5ca72c4f7c
commit 3b4a505821
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/include/asm/kvm_para.h
View File

@ -85,13 +85,13 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1,
return ret; return ret;
} }
static inline int kvm_para_available(void) static inline bool kvm_para_available(void)
{ {
unsigned int eax, ebx, ecx, edx; unsigned int eax, ebx, ecx, edx;
char signature[13]; char signature[13];
if (boot_cpu_data.cpuid_level < 0) if (boot_cpu_data.cpuid_level < 0)
return 0; /* So we don't blow up on old processors */ return false; /* So we don't blow up on old processors */
if (cpu_has_hypervisor) { if (cpu_has_hypervisor) {
cpuid(KVM_CPUID_SIGNATURE, &eax, &ebx, &ecx, &edx); cpuid(KVM_CPUID_SIGNATURE, &eax, &ebx, &ecx, &edx);
@ -101,10 +101,10 @@ static inline int kvm_para_available(void)
signature[12] = 0; signature[12] = 0;
if (strcmp(signature, "KVMKVMKVM") == 0) if (strcmp(signature, "KVMKVMKVM") == 0)
return 1; return true;
} }
return 0; return false;
} }
static inline unsigned int kvm_arch_para_features(void) static inline unsigned int kvm_arch_para_features(void)