Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / x86 / include / asm / kvm_para.h

diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h
index 695399f2d5eb315a62823a9fb8b1673a90447b04..1df115909758862d8e664d86594a4d02e2c72f8c 100644 (file)
--- a/arch/x86/include/asm/kvm_para.h
+++ b/arch/x86/include/asm/kvm_para.h
@@ -85,26 +85,20 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1,
        return ret;
 }
 
-static inline bool kvm_para_available(void)
+static inline uint32_t kvm_cpuid_base(void)
 {
-       unsigned int eax, ebx, ecx, edx;
-       char signature[13];
-
        if (boot_cpu_data.cpuid_level < 0)
-               return false;   /* So we don't blow up on old processors */
+               return 0;       /* So we don't blow up on old processors */
 
-       if (cpu_has_hypervisor) {
-               cpuid(KVM_CPUID_SIGNATURE, &eax, &ebx, &ecx, &edx);
-               memcpy(signature + 0, &ebx, 4);
-               memcpy(signature + 4, &ecx, 4);
-               memcpy(signature + 8, &edx, 4);
-               signature[12] = 0;
+       if (cpu_has_hypervisor)
+               return hypervisor_cpuid_base("KVMKVMKVM\0\0\0", 0);
 
-               if (strcmp(signature, "KVMKVMKVM") == 0)
-                       return true;
-       }
+       return 0;
+}
 
-       return false;
+static inline bool kvm_para_available(void)
+{
+       return kvm_cpuid_base() != 0;
 }
 
 static inline unsigned int kvm_arch_para_features(void)
@@ -118,10 +112,20 @@ void kvm_async_pf_task_wait(u32 token);
 void kvm_async_pf_task_wake(u32 token);
 u32 kvm_read_and_reset_pf_reason(void);
 extern void kvm_disable_steal_time(void);
-#else
-#define kvm_guest_init() do { } while (0)
+
+#ifdef CONFIG_PARAVIRT_SPINLOCKS
+void __init kvm_spinlock_init(void);
+#else /* !CONFIG_PARAVIRT_SPINLOCKS */
+static inline void kvm_spinlock_init(void)
+{
+}
+#endif /* CONFIG_PARAVIRT_SPINLOCKS */
+
+#else /* CONFIG_KVM_GUEST */
+#define kvm_guest_init() do {} while (0)
 #define kvm_async_pf_task_wait(T) do {} while(0)
 #define kvm_async_pf_task_wake(T) do {} while(0)
+
 static inline u32 kvm_read_and_reset_pf_reason(void)
 {
        return 0;