Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761822AbcLSLH2 (ORCPT ); Mon, 19 Dec 2016 06:07:28 -0500 Received: from terminus.zytor.com ([198.137.202.10]:58646 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761223AbcLSLHZ (ORCPT ); Mon, 19 Dec 2016 06:07:25 -0500 Date: Mon, 19 Dec 2016 03:04:30 -0800 From: tip-bot for Andy Lutomirski Message-ID: Cc: jpoimboe@redhat.com, tglx@linutronix.de, tedheadster@gmail.com, luto@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, brgerst@gmail.com, hpa@zytor.com, Xen-devel@lists.xen.org, hmh@hmh.eng.br, jgross@suse.com, gnomes@lxorguk.ukuu.org.uk, andrew.cooper3@citrix.com, dvlasenk@redhat.com, peterz@infradead.org, mingo@kernel.org, boris.ostrovsky@oracle.com, bp@alien8.de Reply-To: mingo@kernel.org, peterz@infradead.org, bp@alien8.de, boris.ostrovsky@oracle.com, jgross@suse.com, gnomes@lxorguk.ukuu.org.uk, hmh@hmh.eng.br, dvlasenk@redhat.com, andrew.cooper3@citrix.com, brgerst@gmail.com, Xen-devel@lists.xen.org, hpa@zytor.com, luto@kernel.org, tedheadster@gmail.com, jpoimboe@redhat.com, tglx@linutronix.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org In-Reply-To: <82acde18a108b8e353180dd6febcc2876df33f24.1481307769.git.luto@kernel.org> References: <82acde18a108b8e353180dd6febcc2876df33f24.1481307769.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] Revert "x86/boot: Fail the boot if !M486 and CPUID is missing" Git-Commit-ID: 426d1aff3138cf38da14e912df3c75e312f96e9e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2220 Lines: 58 Commit-ID: 426d1aff3138cf38da14e912df3c75e312f96e9e Gitweb: http://git.kernel.org/tip/426d1aff3138cf38da14e912df3c75e312f96e9e Author: Andy Lutomirski AuthorDate: Fri, 9 Dec 2016 10:24:06 -0800 Committer: Thomas Gleixner CommitDate: Mon, 19 Dec 2016 11:54:20 +0100 Revert "x86/boot: Fail the boot if !M486 and CPUID is missing" This reverts commit ed68d7e9b9cfb64f3045ffbcb108df03c09a0f98. The patch wasn't quite correct -- there are non-Intel (and hence non-486) CPUs that we support that don't have CPUID. Since we no longer require CPUID for sync_core(), just revert the patch. I think the relevant CPUs are Geode and Elan, but I'm not sure. In principle, we should try to do better at identifying CPUID-less CPUs in early boot, but that's more complicated. Reported-by: One Thousand Gnomes Signed-off-by: Andy Lutomirski Cc: Juergen Gross Cc: Denys Vlasenko Cc: Peter Zijlstra Cc: Brian Gerst Cc: Josh Poimboeuf Cc: Matthew Whitehead Cc: Borislav Petkov Cc: Henrique de Moraes Holschuh Cc: Andrew Cooper Cc: Boris Ostrovsky Cc: xen-devel Cc: Linus Torvalds Link: http://lkml.kernel.org/r/82acde18a108b8e353180dd6febcc2876df33f24.1481307769.git.luto@kernel.org Signed-off-by: Thomas Gleixner --- arch/x86/boot/cpu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c index 4224ede..26240dd 100644 --- a/arch/x86/boot/cpu.c +++ b/arch/x86/boot/cpu.c @@ -87,12 +87,6 @@ int validate_cpu(void) return -1; } - if (CONFIG_X86_MINIMUM_CPU_FAMILY <= 4 && !IS_ENABLED(CONFIG_M486) && - !has_eflag(X86_EFLAGS_ID)) { - printf("This kernel requires a CPU with the CPUID instruction. Build with CONFIG_M486=y to run on this CPU.\n"); - return -1; - } - if (err_flags) { puts("This kernel requires the following features " "not present on the CPU:\n");