diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/xen/hypervisor.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h index 125f344f06a9..d866959e5685 100644 --- a/arch/x86/include/asm/xen/hypervisor.h +++ b/arch/x86/include/asm/xen/hypervisor.h | |||
@@ -40,21 +40,7 @@ extern struct start_info *xen_start_info; | |||
40 | 40 | ||
41 | static inline uint32_t xen_cpuid_base(void) | 41 | static inline uint32_t xen_cpuid_base(void) |
42 | { | 42 | { |
43 | uint32_t base, eax, ebx, ecx, edx; | 43 | return hypervisor_cpuid_base("XenVMMXenVMM", 2); |
44 | char signature[13]; | ||
45 | |||
46 | for (base = 0x40000000; base < 0x40010000; base += 0x100) { | ||
47 | cpuid(base, &eax, &ebx, &ecx, &edx); | ||
48 | *(uint32_t *)(signature + 0) = ebx; | ||
49 | *(uint32_t *)(signature + 4) = ecx; | ||
50 | *(uint32_t *)(signature + 8) = edx; | ||
51 | signature[12] = 0; | ||
52 | |||
53 | if (!strcmp("XenVMMXenVMM", signature) && ((eax - base) >= 2)) | ||
54 | return base; | ||
55 | } | ||
56 | |||
57 | return 0; | ||
58 | } | 44 | } |
59 | 45 | ||
60 | #ifdef CONFIG_XEN | 46 | #ifdef CONFIG_XEN |