Module Name: src
Committed By: maxv
Date: Wed Jun 14 07:45:45 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript
Log Message:
Fix a pretty dumb mistake I made in r1.22: the alignment needs to be in the
bss, otherwise the bootloader will use memory before __kernel_end and give
a wrong start pa to the kernel.
This issue was investigated by Anthony Mallet. Should fix PR/52000.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/conf/kern.ldscript
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/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.22 src/sys/arch/amd64/conf/kern.ldscript:1.23
--- src/sys/arch/amd64/conf/kern.ldscript:1.22 Sat Feb 11 16:02:11 2017
+++ src/sys/arch/amd64/conf/kern.ldscript Wed Jun 14 07:45:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.22 2017/02/11 16:02:11 maxv Exp $ */
+/* $NetBSD: kern.ldscript,v 1.23 2017/06/14 07:45:45 maxv Exp $ */
#include "assym.h"
@@ -63,10 +63,10 @@ SECTIONS
*(.bss)
*(.bss.*)
*(COMMON)
- . = ALIGN(64 / 8);
+ . = ALIGN(__LARGE_PAGE_SIZE);
}
- . = ALIGN(__LARGE_PAGE_SIZE);
+ . = ALIGN(__PAGE_SIZE);
/* End of the kernel image */
__kernel_end = . ;
