Merge branch 'x86/cpu' into x86/core

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

diff --git a/include/asm-x86/bugs.h b/include/asm-x86/bugs.h
index ddf42d36dd506a4d906ca5356c8ac996d4a189f8..ae514c76a96fd09a9c3b65d6b9176c128e1428f2 100644 (file)
--- a/include/asm-x86/bugs.h
+++ b/include/asm-x86/bugs.h
@@ -1,5 +1,12 @@
-#ifdef CONFIG_X86_32
-# include "bugs_32.h"
+#ifndef ASM_X86__BUGS_H
+#define ASM_X86__BUGS_H
+
+extern void check_bugs(void);
+
+#ifdef CONFIG_CPU_SUP_INTEL_32
+int ppro_with_ram_bug(void);
 #else
-# include "bugs_64.h"
+static inline int ppro_with_ram_bug(void) { return 0; }
 #endif
+
+#endif /* ASM_X86__BUGS_H */