x86: Correctly detect hypervisor

[~andy/linux] / arch / x86 / xen / enlighten.c

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 193097ef3d7d0d886ffa88b6c735571b9f66c1ec..2fcaedc0b739d06a399db042895d8592526b6934 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1720,15 +1720,12 @@ static void __init xen_hvm_guest_init(void)
        xen_hvm_init_mmu_ops();
 }
 
-static bool __init xen_hvm_platform(void)
+static uint32_t __init xen_hvm_platform(void)
 {
        if (xen_pv_domain())
-               return false;
-
-       if (!xen_cpuid_base())
-               return false;
+               return 0;
 
-       return true;
+       return xen_cpuid_base();
 }
 
 bool xen_hvm_need_lapic(void)