x86: change early_ioremap to use slots instead of nesting

[safe/jmp/linux-2.6] / include / asm-x86 / pat.h

diff --git a/include/asm-x86/pat.h b/include/asm-x86/pat.h
index 88f60cc..482c3e3 100644 (file)
--- a/include/asm-x86/pat.h
+++ b/include/asm-x86/pat.h
@@ -1,14 +1,13 @@
-
-#ifndef _ASM_PAT_H
-#define _ASM_PAT_H 1
+#ifndef ASM_X86__PAT_H
+#define ASM_X86__PAT_H
 
 #include <linux/types.h>
 
 #ifdef CONFIG_X86_PAT
-extern int pat_wc_enabled;
+extern int pat_enabled;
 extern void validate_pat_support(struct cpuinfo_x86 *c);
 #else
-static const int pat_wc_enabled = 0;
+static const int pat_enabled;
 static inline void validate_pat_support(struct cpuinfo_x86 *c) { }
 #endif
 
@@ -20,5 +19,4 @@ extern int free_memtype(u64 start, u64 end);
 
 extern void pat_disable(char *reason);
 
-#endif
-
+#endif /* ASM_X86__PAT_H */