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

Commit fcab59a3 authored Mar 04, 2008 by Hugh Dickins Committed by Linus Torvalds Mar 04, 2008

x86: a P4 is a P6 not an i486



P4 has been coming out as CPU_FAMILY=4 instead of 6: fix MPENTIUM4 typo.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 62754878

arch/x86/Kconfig.cpu

+1 −1

Original line number	Diff line number	Diff line
		@@ -388,7 +388,7 @@ config X86_OOSTORE
		#
		config X86_P6_NOP
		def_bool y
		depends on (X86_64 \|\| !X86_GENERIC) && (M686 \|\| MPENTIUMII \|\| MPENTIUMIII \|\| MPENTIUMM \|\| MCORE2 \|\| PENTIUM4)
		depends on (X86_64 \|\| !X86_GENERIC) && (M686 \|\| MPENTIUMII \|\| MPENTIUMIII \|\| MPENTIUMM \|\| MCORE2 \|\| MPENTIUM4)

		config X86_TSC
		def_bool y