Module Name: src Committed By: maxv Date: Wed Oct 11 16:18:11 UTC 2017
Modified Files: src/sys/arch/amd64/stand/prekern: locore.S Log Message: Remove this #if, these options belong to the kernel and not the prekern. No real change since eblob is always here. And I was apparently drunk when writing some comments. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/stand/prekern/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/amd64/stand/prekern/locore.S diff -u src/sys/arch/amd64/stand/prekern/locore.S:1.1 src/sys/arch/amd64/stand/prekern/locore.S:1.2 --- src/sys/arch/amd64/stand/prekern/locore.S:1.1 Tue Oct 10 09:29:14 2017 +++ src/sys/arch/amd64/stand/prekern/locore.S Wed Oct 11 16:18:11 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.1 2017/10/10 09:29:14 maxv Exp $ */ +/* $NetBSD: locore.S,v 1.2 2017/10/11 16:18:11 maxv Exp $ */ /* * Copyright (c) 1998, 2000, 2007, 2008, 2016, 2017 The NetBSD Foundation, Inc. @@ -366,21 +366,19 @@ no_NOX: /* Find end of the prekern image; brings us on (1). */ movl $_C_LABEL(__prekern_end),%edi - /* Find end of the kernel image; brind us on (2). */ + /* Find end of the kernel image; brings us on (2). */ movl _C_LABEL(kernpa_end),%eax testl %eax,%eax jz 1f movl %eax,%edi 1: - /* Find end of the kernel symbols; brinds us on (3). */ -#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(makeoptions_COPY_SYMTAB) /* XXX */ + /* Find end of the kernel symbols; brings us on (3). */ movl _C_LABEL(esym),%eax testl %eax,%eax jz 1f movl %eax,%edi 1: -#endif /* Find end of the kernel preloaded modules; brings us on (4). */ movl _C_LABEL(eblob),%eax