arch/x86/mm/pat.c: use boot_cpu_has()

[linux-2.6-omap-h63xx.git] / arch / x86 / mm / pat.c

diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index c0d5680d5f3ca22605300fa1c9800cd34acb225b..e83b770676d5c93102a3ed3c409be41f7bfb6429 100644 (file)
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -28,7 +28,7 @@
 #ifdef CONFIG_X86_PAT
 int __read_mostly pat_wc_enabled = 1;
 
-void __init pat_disable(char *reason)
+void __cpuinit pat_disable(char *reason)
 {
        pat_wc_enabled = 0;
        printk(KERN_INFO "%s\n", reason);
@@ -536,10 +536,10 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
         * we maintain the tradition of paranoia in this code.
         */
        if (!pat_wc_enabled &&
-           ! ( test_bit(X86_FEATURE_MTRR, boot_cpu_data.x86_capability) ||
-               test_bit(X86_FEATURE_K6_MTRR, boot_cpu_data.x86_capability) ||
-               test_bit(X86_FEATURE_CYRIX_ARR, boot_cpu_data.x86_capability) ||
-               test_bit(X86_FEATURE_CENTAUR_MCR, boot_cpu_data.x86_capability)) &&
+           ! ( boot_cpu_has(X86_FEATURE_MTRR) ||
+               boot_cpu_has(X86_FEATURE_K6_MTRR) ||
+               boot_cpu_has(X86_FEATURE_CYRIX_ARR) ||
+               boot_cpu_has(X86_FEATURE_CENTAUR_MCR)) &&
           (pfn << PAGE_SHIFT) >= __pa(high_memory)) {
                flags = _PAGE_CACHE_UC;
        }