From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EA6978B60; Wed, 21 Feb 2024 14:28:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708525697; cv=none; b=HMyeqCoc9lMrgbHLa22rHWJ4RG5o8i8bQKG4FVa2I5y7COIMLPf8hjd/HWiTvefcJlgVAl74wTaZDCHuO3V5CqlaVC8CXZxD9b3wizAF/yI+N3uABg8lCYluz0hvYO6QSDaof8YJrBxkPpkY5RapwrbatSiPJIta/bmqdKRz4cE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708525697; c=relaxed/simple; bh=fuFJR2R5AJeeazK3ApxYJ/z2yuExuE9dVptJOgAsXjc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o55+KDOd9Q4TNcyS+DwEyEdwITDPUAuUs6kJBUUVVUCY+ef14lA2pV79vT5vDNsMm78xZHkyffnAnufIiTZnLmZu5J1WnjLL1Bhw8MCPA02ApU6L1ErojbRb2lKtsyLfZoC7m6ln1z+rG3QWoGOZaysOZQSp1VoXpQ3VMGqHmIY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=oUd3J+jT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="oUd3J+jT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F078BC433C7; Wed, 21 Feb 2024 14:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708525697; bh=fuFJR2R5AJeeazK3ApxYJ/z2yuExuE9dVptJOgAsXjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oUd3J+jTxt+mt6K7ixSwZQJ/KBQ59Z7vHrmqftEKiN7pVTsGwoVp+Qy35SyY7sum2 0kHWqpKZxAlszU+A08UyxMrySBa+VjKfyIqIic4zoFZiD9blMzSEakyX74Ayot/ph6 EKSR3FFt0u6dHtDt+RB9jQ3kqmv+ublYCWa/+d6Y= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Aleksander Mazur , "Borislav Petkov (AMD)" , "H. Peter Anvin" , stable@kernel.org Subject: [PATCH 5.4 236/267] x86/Kconfig: Transmeta Crusoe is CPU family 5, not 6 Date: Wed, 21 Feb 2024 14:09:37 +0100 Message-ID: <20240221125947.659463208@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221125940.058369148@linuxfoundation.org> References: <20240221125940.058369148@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Aleksander Mazur commit f6a1892585cd19e63c4ef2334e26cd536d5b678d upstream. The kernel built with MCRUSOE is unbootable on Transmeta Crusoe. It shows the following error message: This kernel requires an i686 CPU, but only detected an i586 CPU. Unable to boot - please use a kernel appropriate for your CPU. Remove MCRUSOE from the condition introduced in commit in Fixes, effectively changing X86_MINIMUM_CPU_FAMILY back to 5 on that machine, which matches the CPU family given by CPUID. [ bp: Massage commit message. ] Fixes: 25d76ac88821 ("x86/Kconfig: Explicitly enumerate i686-class CPUs in Kconfig") Signed-off-by: Aleksander Mazur Signed-off-by: Borislav Petkov (AMD) Acked-by: H. Peter Anvin Cc: Link: https://lore.kernel.org/r/20240123134309.1117782-1-deweloper@wp.pl Signed-off-by: Greg Kroah-Hartman --- arch/x86/Kconfig.cpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -372,7 +372,7 @@ config X86_CMOV config X86_MINIMUM_CPU_FAMILY int default "64" if X86_64 - default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCRUSOE || MCORE2 || MK7 || MK8) + default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCORE2 || MK7 || MK8) default "5" if X86_32 && X86_CMPXCHG64 default "4"