---

yaml --- r: 99489 b: refs/heads/master c: 46dd98a h: refs/heads/master i: 99487: 4d37fdc v: v3
git-mirror · May 25, 2008 · 8b88998 · 8b88998
1 parent 83226f4
commit 8b88998
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 873b274a41c0cfe58b2eb0a7722424eb367b905b
+refs/heads/master: 46dd98a5c0b907f94742579ab605be1933a37abd
diff --git a/trunk/arch/x86/mm/pat.c b/trunk/arch/x86/mm/pat.c
@@ -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;
 	}