aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/pat.c
diff options
context:
space:
mode:
authorAndreas Herrmann <andreas.herrmann3@amd.com>2008-06-10 10:06:21 -0400
committerIngo Molnar <mingo@elte.hu>2008-06-12 04:14:27 -0400
commit499f8f84b8324ba27d756e03f373fa16eeed9ccc (patch)
tree1a3ca5d9c9ff040978d7aa76183242aa97b2d878 /arch/x86/mm/pat.c
parentcd7a4e936d345ab4cb49d68192d90bd4e4c58458 (diff)
x86: rename pat_wc_enabled to pat_enabled
BTW, what does pat_wc_enabled stand for? Does it mean "write-combining"? Currently it is used to globally switch on or off PAT support. Thus I renamed it to pat_enabled. I think this increases readability (and hope that I didn't miss something). Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/pat.c')
-rw-r--r--arch/x86/mm/pat.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index a8b69bb26972..4beccea0897f 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -26,11 +26,11 @@
26#include <asm/io.h> 26#include <asm/io.h>
27 27
28#ifdef CONFIG_X86_PAT 28#ifdef CONFIG_X86_PAT
29int __read_mostly pat_wc_enabled = 1; 29int __read_mostly pat_enabled = 1;
30 30
31void __cpuinit pat_disable(char *reason) 31void __cpuinit pat_disable(char *reason)
32{ 32{
33 pat_wc_enabled = 0; 33 pat_enabled = 0;
34 printk(KERN_INFO "%s\n", reason); 34 printk(KERN_INFO "%s\n", reason);
35} 35}
36 36
@@ -72,7 +72,7 @@ void pat_init(void)
72{ 72{
73 u64 pat; 73 u64 pat;
74 74
75 if (!pat_wc_enabled) 75 if (!pat_enabled)
76 return; 76 return;
77 77
78 /* Paranoia check. */ 78 /* Paranoia check. */
@@ -225,8 +225,8 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
225 unsigned long actual_type; 225 unsigned long actual_type;
226 int err = 0; 226 int err = 0;
227 227
228 /* Only track when pat_wc_enabled */ 228 /* Only track when pat_enabled */
229 if (!pat_wc_enabled) { 229 if (!pat_enabled) {
230 /* This is identical to page table setting without PAT */ 230 /* This is identical to page table setting without PAT */
231 if (ret_type) { 231 if (ret_type) {
232 if (req_type == -1) { 232 if (req_type == -1) {
@@ -440,8 +440,8 @@ int free_memtype(u64 start, u64 end)
440 struct memtype *ml; 440 struct memtype *ml;
441 int err = -EINVAL; 441 int err = -EINVAL;
442 442
443 /* Only track when pat_wc_enabled */ 443 /* Only track when pat_enabled */
444 if (!pat_wc_enabled) { 444 if (!pat_enabled) {
445 return 0; 445 return 0;
446 } 446 }
447 447
@@ -535,7 +535,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
535 * caching for the high addresses through the KEN pin, but 535 * caching for the high addresses through the KEN pin, but
536 * we maintain the tradition of paranoia in this code. 536 * we maintain the tradition of paranoia in this code.
537 */ 537 */
538 if (!pat_wc_enabled && 538 if (!pat_enabled &&
539 !(boot_cpu_has(X86_FEATURE_MTRR) || 539 !(boot_cpu_has(X86_FEATURE_MTRR) ||
540 boot_cpu_has(X86_FEATURE_K6_MTRR) || 540 boot_cpu_has(X86_FEATURE_K6_MTRR) ||
541 boot_cpu_has(X86_FEATURE_CYRIX_ARR) || 541 boot_cpu_has(X86_FEATURE_CYRIX_ARR) ||