Merge branch 'x86/cpu' into x86/core

[firefly-linux-kernel-4.4.55.git] / include / asm-x86 / bugs.h

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