Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de32e041 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Linus Torvalds
Browse files

x86 Kconfig: change X86_MINIMUM_CPU_MODEL to X86_MINIMUM_CPU_FAMILY 



The X86_MINIMUM_CPU_MODEL name isn't really right, so change it to
X86_MINIMUM_CPU_FAMILY.  Also, the default minimum should be 3, not 0.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ec481536

arch/i386/Kconfig.cpu

+3 −3
Original line number Diff line number Diff line
@@ -344,8 +344,8 @@ config X86_CMOV 
	depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7)

	default y



config X86_MINIMUM_CPU_MODEL

config X86_MINIMUM_CPU_FAMILY

	int

	default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP

	default "0"

	default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK

	default "3"

arch/i386/kernel/verify_cpu.S

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ verify_cpu: 
	pushl	$0			# Kill any dangerous flags

	popfl



#if CONFIG_X86_MINIMUM_CPU_MODEL >= 4

#if CONFIG_X86_MINIMUM_CPU_FAMILY >= 4

	pushfl

	pop	%eax

	orl	$(1<<18),%eax		# try setting AC
@@ -75,7 +75,7 @@ verify_cpu: 
	movl    $0x1,%eax		# Does the cpu have what it takes

	cpuid



#if CONFIG_X86_MINIMUM_CPU_MODEL > 4

#if CONFIG_X86_MINIMUM_CPU_FAMILY > 4

#error	add proper model checking here

#endif