Skip to content

Commit

Permalink
x86, kvm: Fix intialization warnings in kvm.c
Browse files Browse the repository at this point in the history
With commit:

  4cca6ea ("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>
  • Loading branch information
Alok N Kataria authored and Ingo Molnar committed Jan 29, 2013
1 parent 5ca72c4 commit 3b4a505
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/x86/include/asm/kvm_para.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
Expand Down

0 comments on commit 3b4a505

Please sign in to comment.