diff options
| author | Alok N Kataria <akataria@vmware.com> | 2013-01-28 18:59:12 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-01-29 09:13:49 +0100 |
| commit | 3b4a505821615b6c055536a0c23ea37c349bb6a9 (patch) | |
| tree | 58caccc02e664ab4dea0a8000db1752e15c376b5 /arch/x86/include/asm/kvm_para.h | |
| parent | 5ca72c4f7c412c2002363218901eba5516c476b1 (diff) | |
| download | linux-3b4a505821615b6c055536a0c23ea37c349bb6a9.tar.bz2 | |
x86, kvm: Fix intialization warnings in kvm.c
With commit:
4cca6ea04d31 ("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>
Diffstat (limited to 'arch/x86/include/asm/kvm_para.h')
| -rw-r--r-- | arch/x86/include/asm/kvm_para.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h index 5ed1f16187be..65231e173baf 100644 --- a/arch/x86/include/asm/kvm_para.h +++ b/arch/x86/include/asm/kvm_para.h @@ -85,13 +85,13 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1, return ret; } -static inline int kvm_para_available(void) +static inline bool kvm_para_available(void) { unsigned int eax, ebx, ecx, edx; char signature[13]; 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) { cpuid(KVM_CPUID_SIGNATURE, &eax, &ebx, &ecx, &edx); @@ -101,10 +101,10 @@ static inline int kvm_para_available(void) signature[12] = 0; if (strcmp(signature, "KVMKVMKVM") == 0) - return 1; + return true; } - return 0; + return false; } static inline unsigned int kvm_arch_para_features(void) |