[src/trunk]: src/sys/arch/amd64/conf Fix a pretty dumb mistake I made in r1.2...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dede55828bfe
branches:  trunk
changeset: 824675:dede55828bfe
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Jun 14 07:45:45 2017 +0000

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

diffstat:

 sys/arch/amd64/conf/kern.ldscript |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r 64be825ec1a7 -r dede55828bfe sys/arch/amd64/conf/kern.ldscript
--- a/sys/arch/amd64/conf/kern.ldscript Wed Jun 14 07:38:24 2017 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript Wed Jun 14 07:45:45 2017 +0000
@@ -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 @@
                *(.bss)
                *(.bss.*)
                *(COMMON)
-               . = ALIGN(64 / 8);
+               . = ALIGN(__LARGE_PAGE_SIZE);
        }
 
-       . = ALIGN(__LARGE_PAGE_SIZE);
+       . = ALIGN(__PAGE_SIZE);
 
        /* End of the kernel image */
        __kernel_end = . ;