diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
| commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e (patch) | |
| tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 /include/asm-x86/bugs.h | |
| parent | 671eef85a3e885dff4ce210d8774ad50a91d5967 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/core
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'include/asm-x86/bugs.h')
| -rw-r--r-- | include/asm-x86/bugs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-x86/bugs.h b/include/asm-x86/bugs.h index 4761c461d23a..ae514c76a96f 100644 --- a/include/asm-x86/bugs.h +++ b/include/asm-x86/bugs.h | |||
| @@ -2,6 +2,11 @@ | |||
| 2 | #define ASM_X86__BUGS_H | 2 | #define ASM_X86__BUGS_H |
| 3 | 3 | ||
| 4 | extern void check_bugs(void); | 4 | extern void check_bugs(void); |
| 5 | |||
| 6 | #ifdef CONFIG_CPU_SUP_INTEL_32 | ||
| 5 | int ppro_with_ram_bug(void); | 7 | int ppro_with_ram_bug(void); |
| 8 | #else | ||
| 9 | static inline int ppro_with_ram_bug(void) { return 0; } | ||
| 10 | #endif | ||
| 6 | 11 | ||
| 7 | #endif /* ASM_X86__BUGS_H */ | 12 | #endif /* ASM_X86__BUGS_H */ |