Module Name:    src
Committed By:   jdolecek
Date:           Sun Jun 24 17:11:57 UTC 2018

Modified Files:
        src/sys/arch/amd64/conf: kern.ldscript.Xen

Log Message:
follow change in rev. 1.22 of kern.ldscript and apply same fix for xen
ldscript too, but using just regular PAGE_ALIGN alignment:

"""
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 got broke by amd64/locore.S rev. 1.141 which removed an unused variable
which forced the alignment

this fixes ps/bt in ddb to be able to find symbols and hence PR port-xen/53056


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/conf/kern.ldscript.Xen

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.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.14 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.15
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.14	Sun Jan  7 12:42:46 2018
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen	Sun Jun 24 17:11:57 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript.Xen,v 1.14 2018/01/07 12:42:46 maxv Exp $	*/
+/*	$NetBSD: kern.ldscript.Xen,v 1.15 2018/06/24 17:11:57 jdolecek Exp $	*/
 
 #include "assym.h"
 
@@ -61,7 +61,7 @@ SECTIONS
 		*(.bss)
 		*(.bss.*)
 		*(COMMON)
-		. = ALIGN(64 / 8);
+		. = ALIGN(__PAGE_SIZE);
 	}
 
 	. = ALIGN(__PAGE_SIZE);

Reply via email to