[src/trunk]: src/sys/arch/i386/i386 Make multiboot1 continue with common boot...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/823155a9b2ae
branches:  trunk
changeset: 373331:823155a9b2ae
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Fri Feb 03 09:21:58 2023 +0000

description:
Make multiboot1 continue with common boot code and not skip CPU type
detection.

Fixes PR 57017 and PR 56935.

diffstat:

 sys/arch/i386/i386/locore.S |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r f36d8a0ae5d8 -r 823155a9b2ae sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S       Fri Feb 03 08:08:33 2023 +0000
+++ b/sys/arch/i386/i386/locore.S       Fri Feb 03 09:21:58 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.190 2022/09/07 00:40:18 knakahara Exp $   */
+/*     $NetBSD: locore.S,v 1.191 2023/02/03 09:21:58 mlelstv Exp $     */
 
 /*
  * Copyright-o-rama!
@@ -128,7 +128,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.190 2022/09/07 00:40:18 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.191 2023/02/03 09:21:58 mlelstv Exp $");
 
 #include "opt_copy_symtab.h"
 #include "opt_ddb.h"
@@ -415,7 +415,7 @@
        pushl   %ebx            /* Address of Multiboot information */
        call    _C_LABEL(multiboot1_pre_reloc)
        addl    $4,%esp
-       jmp     2f
+       jmp     .Lstart_common
 
 efi_multiboot2_loader:
        /*