[src/netbsd-10]: src/sys/arch/i386/i386 Pull up following revision(s) (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/5b1b013cb7f8
branches:  netbsd-10
changeset: 373426:5b1b013cb7f8
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Feb 08 18:27:05 2023 +0000

description:
Pull up following revision(s) (requested by khorben in ticket #76):

        sys/arch/i386/i386/locore.S: revision 1.191

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 cd071802c2a2 -r 5b1b013cb7f8 sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S       Wed Feb 08 18:24:52 2023 +0000
+++ b/sys/arch/i386/i386/locore.S       Wed Feb 08 18:27:05 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.190.4.1 2023/02/08 18:27:05 martin 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.190.4.1 2023/02/08 18:27:05 martin 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:
        /*