diff options
| author |   H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:08:42 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:08:42 -0700 |
| commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e (patch) | |
| tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 /include/asm-x86/bugs.h | |
| parent | x86, e820: add support for AddressRangeUnusuable ACPI memory type (diff) | |
| parent | x86: cpufeature: fix SMX flag (diff) | |
| download | linux-dev-7203781c98ad9147564d327de6f6513ad8fc0f4e.tar.xz linux-dev-7203781c98ad9147564d327de6f6513ad8fc0f4e.zip | |
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 @@ #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 */ |