Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/amd64/conf follow change in rev. 1.22 of kern.ldscr...



details:   https://anonhg.NetBSD.org/src/rev/8ded7d1412e3
branches:  trunk
changeset: 323650:8ded7d1412e3
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Jun 24 17:11:57 2018 +0000

description:
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

diffstat:

 sys/arch/amd64/conf/kern.ldscript.Xen |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r fbe4424f05ad -r 8ded7d1412e3 sys/arch/amd64/conf/kern.ldscript.Xen
--- a/sys/arch/amd64/conf/kern.ldscript.Xen     Sun Jun 24 15:36:31 2018 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript.Xen     Sun Jun 24 17:11:57 2018 +0000
@@ -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 @@
                *(.bss)
                *(.bss.*)
                *(COMMON)
-               . = ALIGN(64 / 8);
+               . = ALIGN(__PAGE_SIZE);
        }
 
        . = ALIGN(__PAGE_SIZE);



Home | Main Index | Thread Index | Old Index