Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c2dcfde8274883e1f6050784dcbd34b01e824b91

Authored by H. Peter Anvin
Committed by Ingo Molnar
1 parent 875e40b975
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 4 changed files with 4 additions and 8 deletions Side-by-side Diff

arch/x86/boot/boot.h
Diff comments   View file @ c2dcfde
... ... @@ -24,8 +24,8 @@
24 24 #include <linux/edd.h>
25 25 #include <asm/boot.h>
26 26 #include <asm/setup.h>
27   -
28   -#define NCAPINTS 8
  27 +#include "bitops.h"
  28 +#include <asm/cpufeature.h>
29 29  
30 30 /* Useful macros */
31 31 #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
... ... @@ -16,9 +16,6 @@
16 16 */
17 17  
18 18 #include "boot.h"
19   -#include "bitops.h"
20   -#include <asm/cpufeature.h>
21   -
22 19 #include "cpustr.h"
23 20  
24 21 static char *cpu_name(int level)
arch/x86/boot/cpucheck.c
Diff comments   View file @ c2dcfde
... ... @@ -22,10 +22,8 @@
22 22  
23 23 #ifdef _SETUP
24 24 # include "boot.h"
25   -# include "bitops.h"
26 25 #endif
27 26 #include <linux/types.h>
28   -#include <asm/cpufeature.h>
29 27 #include <asm/processor-flags.h>
30 28 #include <asm/required-features.h>
31 29 #include <asm/msr-index.h>
arch/x86/boot/main.c
Diff comments   View file @ c2dcfde
... ... @@ -73,7 +73,8 @@
73 73 */
74 74 static void query_ist(void)
75 75 {
76   - /* Some 486 BIOSes apparently crash on this call */
  76 + /* Some older BIOSes apparently crash on this call, so filter
  77 + it from machines too old to have SpeedStep at all. */
77 78 if (cpu.level < 6)
78 79 return;
79 80