3 files changed, 11 insertions, 11 deletions

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 71bb3159031a..ddeafed1171e 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -261,7 +261,7 @@ void __iomem *ioremap_nocache(resource_size_t phys_addr, unsigned long size)
 {
         /*
          * Ideally, this should be:
-         *      pat_wc_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS;
+         *      pat_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS;
          *
          * Till we fix all X drivers to use ioremap_wc(), we will use
          * UC MINUS.
@@ -285,7 +285,7 @@ EXPORT_SYMBOL(ioremap_nocache);
  */
 void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size)
 {
-        if (pat_wc_enabled)
+        if (pat_enabled)
                 return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,
                                         __builtin_return_address(0));
         else
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 60bcb5b6a37e..6916fe4bf0cb 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -805,7 +805,7 @@ int _set_memory_wc(unsigned long addr, int numpages)
 
 int set_memory_wc(unsigned long addr, int numpages)
 {
-        if (!pat_wc_enabled)
+        if (!pat_enabled)
                 return set_memory_uc(addr, numpages);
 
         if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
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 @@
 #include <asm/io.h>
 
 #ifdef CONFIG_X86_PAT
-int __read_mostly pat_wc_enabled = 1;
+int __read_mostly pat_enabled = 1;
 
 void __cpuinit pat_disable(char *reason)
 {
-        pat_wc_enabled = 0;
+        pat_enabled = 0;
         printk(KERN_INFO "%s\n", reason);
 }
 
@@ -72,7 +72,7 @@ void pat_init(void)
 {
         u64 pat;
 
-        if (!pat_wc_enabled)
+        if (!pat_enabled)
                 return;
 
         /* Paranoia check. */
@@ -225,8 +225,8 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
         unsigned long actual_type;
         int err = 0;
 
-        /* Only track when pat_wc_enabled */
-        if (!pat_wc_enabled) {
+        /* Only track when pat_enabled */
+        if (!pat_enabled) {
                 /* This is identical to page table setting without PAT */
                 if (ret_type) {
                         if (req_type == -1) {
@@ -440,8 +440,8 @@ int free_memtype(u64 start, u64 end)
         struct memtype *ml;
         int err = -EINVAL;
 
-        /* Only track when pat_wc_enabled */
-        if (!pat_wc_enabled) {
+        /* Only track when pat_enabled */
+        if (!pat_enabled) {
                 return 0;
         }
 
@@ -535,7 +535,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
          * caching for the high addresses through the KEN pin, but
          * we maintain the tradition of paranoia in this code.
          */
-        if (!pat_wc_enabled &&
+        if (!pat_enabled &&
             !(boot_cpu_has(X86_FEATURE_MTRR) ||
               boot_cpu_has(X86_FEATURE_K6_MTRR) ||
               boot_cpu_has(X86_FEATURE_CYRIX_ARR) ||