diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-13 13:14:22 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 00:13:52 +0200 |
| commit | c2dcfde8274883e1f6050784dcbd34b01e824b91 (patch) | |
| tree | ad63e2f52eea14c080379dc36d194adb985987ed | |
| parent | 875e40b97571e1f06d1184ad6cbb2acf9cb31a23 (diff) | |
x86: cleanup for setup code crashes during IST probe
Clean up the code for crashes during SpeedStep probing on older
machines.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/boot/boot.h | 4 | ||||
| -rw-r--r-- | arch/x86/boot/cpu.c | 3 | ||||
| -rw-r--r-- | arch/x86/boot/cpucheck.c | 2 | ||||
| -rw-r--r-- | arch/x86/boot/main.c | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index 9d4b4b43d97a..616b804a2295 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h @@ -24,8 +24,8 @@ #include <linux/edd.h> #include <asm/boot.h> #include <asm/setup.h> - -#define NCAPINTS 8 +#include "bitops.h" +#include <asm/cpufeature.h> /* Useful macros */ #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c index 92d6fd73dc7d..75298fe2edca 100644 --- a/arch/x86/boot/cpu.c +++ b/arch/x86/boot/cpu.c @@ -16,9 +16,6 @@ */ #include "boot.h" -#include "bitops.h" -#include <asm/cpufeature.h> - #include "cpustr.h" static char *cpu_name(int level) diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c index c1ce0303d994..4b9ae7c56748 100644 --- a/arch/x86/boot/cpucheck.c +++ b/arch/x86/boot/cpucheck.c @@ -22,10 +22,8 @@ #ifdef _SETUP # include "boot.h" -# include "bitops.h" #endif #include <linux/types.h> -#include <asm/cpufeature.h> #include <asm/processor-flags.h> #include <asm/required-features.h> #include <asm/msr-index.h> diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c index 01aa64b5575b..197421db1af1 100644 --- a/arch/x86/boot/main.c +++ b/arch/x86/boot/main.c @@ -73,7 +73,8 @@ static void keyboard_set_repeat(void) */ static void query_ist(void) { - /* Some 486 BIOSes apparently crash on this call */ + /* Some older BIOSes apparently crash on this call, so filter + it from machines too old to have SpeedStep at all. */ if (cpu.level < 6) return; |