]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Revert "x86/boot: Fail the boot if !M486 and CPUID is missing"
authorAndy Lutomirski <luto@kernel.org>
Fri, 9 Dec 2016 18:24:06 +0000 (10:24 -0800)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 19 Dec 2016 10:54:20 +0000 (11:54 +0100)
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 <gnomes@lxorguk.ukuu.org.uk>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Juergen Gross <jgross@suse.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Matthew Whitehead <tedheadster@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: xen-devel <Xen-devel@lists.xen.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/82acde18a108b8e353180dd6febcc2876df33f24.1481307769.git.luto@kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/boot/cpu.c

index 4224ede43b4edc3df93b5e669cc091d73b9186b5..26240dde081e82e696b9a828a191b01c7bdaf0a9 100644 (file)
@@ -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");