Commit c2dcfde8 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Ingo Molnar
Browse files

x86: cleanup for setup code crashes during IST probe 



Clean up the code for crashes during SpeedStep probing on older
machines.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 875e40b9

arch/x86/boot/boot.h

+2 −2
Original line number Diff line number Diff line
@@ -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)]))

arch/x86/boot/cpu.c

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 
 */



#include "boot.h"

#include "bitops.h"

#include <asm/cpufeature.h>



#include "cpustr.h"



static char *cpu_name(int level)

arch/x86/boot/cpucheck.c

+0 −2
Original line number Diff line number Diff line
@@ -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>

arch/x86/boot/main.c

+2 −1
Original line number Diff line number Diff line
@@ -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;