From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933338AbYCDTfy (ORCPT ); Tue, 4 Mar 2008 14:35:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933365AbYCDTfF (ORCPT ); Tue, 4 Mar 2008 14:35:05 -0500 Received: from extu-mxob-2.symantec.com ([216.10.194.135]:57710 "EHLO extu-mxob-2.symantec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932928AbYCDTfE (ORCPT ); Tue, 4 Mar 2008 14:35:04 -0500 Date: Tue, 4 Mar 2008 19:33:24 +0000 (GMT) From: Hugh Dickins X-X-Sender: hugh@blonde.site To: Linus Torvalds cc: Andrew Morton , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH] x86: a P4 is a P6 not an i486 Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org P4 has been coming out as CPU_FAMILY=4 instead of 6: fix MPENTIUM4 typo. Signed-off-by: Hugh Dickins --- arch/x86/Kconfig.cpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 2.6.25-rc3-git/arch/x86/Kconfig.cpu 2008-02-27 07:57:20.000000000 +0000 +++ linux/arch/x86/Kconfig.cpu 2008-03-04 13:50:39.000000000 +0000 @@ -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