File tree Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Original file line number Diff line number Diff line change 1
- /* $NetBSD: locore.S,v 1.149 2017/07/29 12:34:34 maxv Exp $ */
1
+ /* $NetBSD: locore.S,v 1.150 2017/08/10 14:13:45 maxv Exp $ */
2
2
3
3
/*
4
4
* Copyright-o-rama!
128
128
*/
129
129
130
130
#include <machine/asm.h>
131
- __KERNEL_RCSID(0 , "$NetBSD: locore.S,v 1.149 2017/07/29 12:34:34 maxv Exp $" );
131
+ __KERNEL_RCSID(0 , "$NetBSD: locore.S,v 1.150 2017/08/10 14:13:45 maxv Exp $" );
132
132
133
133
#include "opt_copy_symtab.h"
134
134
#include "opt_ddb.h"
@@ -342,11 +342,13 @@ _C_LABEL(Multiboot_Header):
342
342
jne 1f
343
343
344
344
/*
345
- * Indeed, a multiboot-compliant boot loader executed us. We copy
346
- * the received Multiboot information structure into kernel's data
347
- * space to process it later -- after we are relocated. It will
348
- * be safer to run complex C code than doing it at this point.
345
+ * Indeed, a multiboot-compliant boot loader executed us. We switch
346
+ * to the temporary stack, and copy the received Multiboot information
347
+ * structure into kernel's data space to process it later -- after we
348
+ * are relocated. It will be safer to run complex C code than doing it
349
+ * at this point.
349
350
*/
351
+ movl $_RELOC(tmpstk),%esp
350
352
pushl %ebx /* Address of Multiboot information */
351
353
call _C_LABEL(multiboot_pre_reloc)
352
354
addl $4 ,%esp
You can’t perform that action at this time.
0 commit comments