diff options
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index ff962d4b821e..9a6346865c49 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <xen/interface/physdev.h> | 38 | #include <xen/interface/physdev.h> |
| 39 | #include <xen/interface/vcpu.h> | 39 | #include <xen/interface/vcpu.h> |
| 40 | #include <xen/interface/memory.h> | 40 | #include <xen/interface/memory.h> |
| 41 | #include <xen/interface/xen-mca.h> | ||
| 41 | #include <xen/features.h> | 42 | #include <xen/features.h> |
| 42 | #include <xen/page.h> | 43 | #include <xen/page.h> |
| 43 | #include <xen/hvm.h> | 44 | #include <xen/hvm.h> |
| @@ -341,9 +342,7 @@ static void __init xen_init_cpuid_mask(void) | |||
| 341 | unsigned int xsave_mask; | 342 | unsigned int xsave_mask; |
| 342 | 343 | ||
| 343 | cpuid_leaf1_edx_mask = | 344 | cpuid_leaf1_edx_mask = |
| 344 | ~((1 << X86_FEATURE_MCE) | /* disable MCE */ | 345 | ~((1 << X86_FEATURE_MTRR) | /* disable MTRR */ |
| 345 | (1 << X86_FEATURE_MCA) | /* disable MCA */ | ||
| 346 | (1 << X86_FEATURE_MTRR) | /* disable MTRR */ | ||
| 347 | (1 << X86_FEATURE_ACC)); /* thermal monitoring */ | 346 | (1 << X86_FEATURE_ACC)); /* thermal monitoring */ |
| 348 | 347 | ||
| 349 | if (!xen_initial_domain()) | 348 | if (!xen_initial_domain()) |
