[Xen-devel] [PATCH 15/19] xen mtrr: Use specific cpu_has_foo macros instead of generic cpu_has()

[Jeremy Fitzhardinge <jeremy@xxxxxxxx>]

From: Mark McLoughlin <markmc@xxxxxxxxxx>

Signed-off-by: Mark McLoughlin <markmc@xxxxxxxxxx>
---
 arch/x86/kernel/cpu/mtrr/xen.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/cpu/mtrr/xen.c b/arch/x86/kernel/cpu/mtrr/xen.c
index db3ef39..e03532c 100644
--- a/arch/x86/kernel/cpu/mtrr/xen.c
+++ b/arch/x86/kernel/cpu/mtrr/xen.c
@@ -44,15 +44,13 @@ static int __init xen_num_var_ranges(void)
 
 void __init xen_init_mtrr(void)
 {
-       struct cpuinfo_x86 *c = &boot_cpu_data;
-
        if (!xen_initial_domain())
                return;
 
-       if ((!cpu_has(c, X86_FEATURE_MTRR)) &&
-           (!cpu_has(c, X86_FEATURE_K6_MTRR)) &&
-           (!cpu_has(c, X86_FEATURE_CYRIX_ARR)) &&
-           (!cpu_has(c, X86_FEATURE_CENTAUR_MCR)))
+       if (!cpu_has_mtrr &&
+           !cpu_has_k6_mtrr &&
+           !cpu_has_cyrix_arr &&
+           !cpu_has_centaur_mcr)
                return;
 
        mtrr_if = &xen_mtrr_ops;
-- 
1.6.0.6


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel