Merge branch 'x86/cpu' into x86/core

Conflicts:

	arch/x86/kernel/cpu/feature_names.c
	include/asm-x86/cpufeature.h
This commit is contained in:
H. Peter Anvin
2008-09-04 08:08:42 -07:00
930 changed files with 13383 additions and 8862 deletions

View File

@@ -2,6 +2,11 @@
#define ASM_X86__BUGS_H
extern void check_bugs(void);
#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 */