From 8b8899860cb31ad5141388a01cfaa618ebc2bc79 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 14 May 2008 16:10:39 -0700 Subject: [PATCH] --- yaml --- r: 99489 b: refs/heads/master c: 46dd98a5c0b907f94742579ab605be1933a37abd h: refs/heads/master i: 99487: 4d37fdc72f44e35764270a77827c899a28da09c4 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/pat.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f1b7014fe724..c1604b140d72 100644 --- 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 index a1cbea0b79b1..e83b770676d5 100644 --- 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; }