diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:48:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:48:29 -0800 |
| commit | 8c8ae4e8cd5a67467192f3361eeec463694f8ed8 (patch) | |
| tree | c4216f3f8cb89dd6a12e727d886abc0f6ab74c83 /arch/x86/xen/enlighten.c | |
| parent | a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9 (diff) | |
| parent | d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067 (diff) | |
| download | linux-8c8ae4e8cd5a67467192f3361eeec463694f8ed8.tar.gz linux-8c8ae4e8cd5a67467192f3361eeec463694f8ed8.tar.bz2 linux-8c8ae4e8cd5a67467192f3361eeec463694f8ed8.zip | |
Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen: HVM X2APIC support
apic: Move hypervisor detection of x2apic to hypervisor.h
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index aa8c89ae54cf..6aba2a23e2c3 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1256,25 +1256,6 @@ asmlinkage void __init xen_start_kernel(void) #endif } -static uint32_t xen_cpuid_base(void) -{ - uint32_t base, eax, ebx, ecx, edx; - char signature[13]; - - for (base = 0x40000000; base < 0x40010000; base += 0x100) { - cpuid(base, &eax, &ebx, &ecx, &edx); - *(uint32_t *)(signature + 0) = ebx; - *(uint32_t *)(signature + 4) = ecx; - *(uint32_t *)(signature + 8) = edx; - signature[12] = 0; - - if (!strcmp("XenVMMXenVMM", signature) && ((eax - base) >= 2)) - return base; - } - - return 0; -} - static int init_hvm_pv_info(int *major, int *minor) { uint32_t eax, ebx, ecx, edx, pages, msr, base; @@ -1384,6 +1365,18 @@ static bool __init xen_hvm_platform(void) return true; } +bool xen_hvm_need_lapic(void) +{ + if (xen_pv_domain()) + return false; + if (!xen_hvm_domain()) + return false; + if (xen_feature(XENFEAT_hvm_pirqs) && xen_have_vector_callback) + return false; + return true; +} +EXPORT_SYMBOL_GPL(xen_hvm_need_lapic); + const __refconst struct hypervisor_x86 x86_hyper_xen_hvm = { .name = "Xen HVM", .detect = xen_hvm_platform, |