diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:15:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:15:39 +0200 |
| commit | cb44d0cfc2969999a4d9e20e4fd8749fec6c5498 (patch) | |
| tree | 51fad115c6e18d0df352531baa1eb9bcb7aaa5e9 /arch/x86/xen/enlighten.c | |
| parent | 482dd2ef124484601adea82e5e806e81e2bc5521 (diff) | |
| parent | d7847a7017b2a2759dd5590c0cffdbdf2994918e (diff) | |
| download | linux-cb44d0cfc2969999a4d9e20e4fd8749fec6c5498.tar.bz2 | |
Merge branch 'x86/cpu' into x86/asm, to merge more patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 880862c7d9dd..ff2a2e6ef7af 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1469,10 +1469,10 @@ static void xen_pvh_set_cr_flags(int cpu) * For BSP, PSE PGE are set in probe_page_size_mask(), for APs * set them here. For all, OSFXSR OSXMMEXCPT are set in fpu__init_cpu(). */ - if (cpu_has_pse) + if (boot_cpu_has(X86_FEATURE_PSE)) cr4_set_bits_and_update_boot(X86_CR4_PSE); - if (cpu_has_pge) + if (boot_cpu_has(X86_FEATURE_PGE)) cr4_set_bits_and_update_boot(X86_CR4_PGE); } |