Module Name: src
Committed By: mlelstv
Date: Fri Feb 3 09:21:58 UTC 2023
Modified Files:
src/sys/arch/i386/i386: locore.S
Log Message:
Make multiboot1 continue with common boot code and not skip CPU type
detection.
Fixes PR 57017 and PR 56935.
To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/i386/i386/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.190 src/sys/arch/i386/i386/locore.S:1.191
--- src/sys/arch/i386/i386/locore.S:1.190 Wed Sep 7 00:40:18 2022
+++ src/sys/arch/i386/i386/locore.S Fri Feb 3 09:21:58 2023
@@ -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 @@ multiboot1_loader:
pushl %ebx /* Address of Multiboot information */
call _C_LABEL(multiboot1_pre_reloc)
addl $4,%esp
- jmp 2f
+ jmp .Lstart_common
efi_multiboot2_loader:
/*
