diff options
author | Vitaly Kuznetsov <vkuznets@redhat.com> | 2016-06-30 11:56:35 -0400 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2016-07-25 08:30:45 -0400 |
commit | de2f5537b397249e91cafcbed4de64a24818542e (patch) | |
tree | afb616adc5580c8952a3c25257574014ce414d3f | |
parent | fbc872c38c8fed31948c85683b5326ee5ab9fccc (diff) |
x86/xen: update cpuid.h from Xen-4.7
Update cpuid.h header from xen hypervisor tree to get
XEN_HVM_CPUID_VCPU_ID_PRESENT definition.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
-rw-r--r-- | arch/x86/include/asm/xen/cpuid.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/include/asm/xen/cpuid.h b/arch/x86/include/asm/xen/cpuid.h index 0d809e9fc975..3bdd10d71223 100644 --- a/arch/x86/include/asm/xen/cpuid.h +++ b/arch/x86/include/asm/xen/cpuid.h | |||
@@ -76,15 +76,18 @@ | |||
76 | /* | 76 | /* |
77 | * Leaf 5 (0x40000x04) | 77 | * Leaf 5 (0x40000x04) |
78 | * HVM-specific features | 78 | * HVM-specific features |
79 | * EAX: Features | ||
80 | * EBX: vcpu id (iff EAX has XEN_HVM_CPUID_VCPU_ID_PRESENT flag) | ||
79 | */ | 81 | */ |
80 | 82 | ||
81 | /* EAX Features */ | ||
82 | /* Virtualized APIC registers */ | 83 | /* Virtualized APIC registers */ |
83 | #define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0) | 84 | #define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0) |
84 | /* Virtualized x2APIC accesses */ | 85 | /* Virtualized x2APIC accesses */ |
85 | #define XEN_HVM_CPUID_X2APIC_VIRT (1u << 1) | 86 | #define XEN_HVM_CPUID_X2APIC_VIRT (1u << 1) |
86 | /* Memory mapped from other domains has valid IOMMU entries */ | 87 | /* Memory mapped from other domains has valid IOMMU entries */ |
87 | #define XEN_HVM_CPUID_IOMMU_MAPPINGS (1u << 2) | 88 | #define XEN_HVM_CPUID_IOMMU_MAPPINGS (1u << 2) |
89 | /* vcpu id is present in EBX */ | ||
90 | #define XEN_HVM_CPUID_VCPU_ID_PRESENT (1u << 3) | ||
88 | 91 | ||
89 | #define XEN_CPUID_MAX_NUM_LEAVES 4 | 92 | #define XEN_CPUID_MAX_NUM_LEAVES 4 |
90 | 93 | ||