Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[linux-2.6-omap-h63xx.git] / include / asm-x86 / pat.h

diff --git a/include/asm-x86/pat.h b/include/asm-x86/pat.h
index 8b822b5a17861215eacfa2d7253ea99c84f310b7..7edc473072179c48defd9043a2ec5be0202dbbcf 100644 (file)
--- a/include/asm-x86/pat.h
+++ b/include/asm-x86/pat.h
@@ -1,10 +1,15 @@
-
 #ifndef _ASM_PAT_H
-#define _ASM_PAT_H 1
+#define _ASM_PAT_H
 
 #include <linux/types.h>
 
-extern int pat_wc_enabled;
+#ifdef CONFIG_X86_PAT
+extern int pat_enabled;
+extern void validate_pat_support(struct cpuinfo_x86 *c);
+#else
+static const int pat_enabled;
+static inline void validate_pat_support(struct cpuinfo_x86 *c) { }
+#endif
 
 extern void pat_init(void);
 
@@ -12,5 +17,6 @@ extern int reserve_memtype(u64 start, u64 end,
                unsigned long req_type, unsigned long *ret_type);
 extern int free_memtype(u64 start, u64 end);
 
-#endif
+extern void pat_disable(char *reason);
 
+#endif