aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/pat.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/mm/pat.c')
-rw-r--r--arch/x86/mm/pat.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 0648a2225b09..72c0f6097402 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -40,19 +40,8 @@ static int pat_known_cpu(void)
40 if (!pat_wc_enabled) 40 if (!pat_wc_enabled)
41 return 0; 41 return 0;
42 42
43 if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && 43 if (cpu_has_pat)
44 (boot_cpu_data.x86 == 0xF || 44 return 1;
45 (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model >= 15))) {
46 if (cpu_has_pat) {
47 return 1;
48 }
49 }
50 if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD &&
51 boot_cpu_data.x86 >= 0xf && boot_cpu_data.x86 <= 0x11) {
52 if (cpu_has_pat) {
53 return 1;
54 }
55 }
56 45
57 pat_wc_enabled = 0; 46 pat_wc_enabled = 0;
58 printk(KERN_INFO "CPU and/or kernel does not support PAT.\n"); 47 printk(KERN_INFO "CPU and/or kernel does not support PAT.\n");