Module Name: src
Committed By: maxv
Date: Mon Oct 23 06:00:59 UTC 2017
Modified Files:
src/sys/arch/amd64/stand/prekern: mm.c
src/sys/arch/x86/x86: x86_machdep.c
Log Message:
Add two XXXs, so that people don't get confused, a fifth region is needed
anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/stand/prekern/mm.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/x86/x86/x86_machdep.c
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/mm.c
diff -u src/sys/arch/amd64/stand/prekern/mm.c:1.3 src/sys/arch/amd64/stand/prekern/mm.c:1.4
--- src/sys/arch/amd64/stand/prekern/mm.c:1.3 Wed Oct 18 17:12:42 2017
+++ src/sys/arch/amd64/stand/prekern/mm.c Mon Oct 23 06:00:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mm.c,v 1.3 2017/10/18 17:12:42 maxv Exp $ */
+/* $NetBSD: mm.c,v 1.4 2017/10/23 06:00:59 maxv Exp $ */
/*
* Copyright (c) 2017 The NetBSD Foundation, Inc. All rights reserved.
@@ -174,7 +174,7 @@ mm_rand_base()
size = (NKL2_KIMG_ENTRIES + 1) * NBPD_L2;
- /* yes, this is ridiculous */
+ /* XXX: yes, this is ridiculous, will be fixed soon */
rnd = rdtsc();
randva = rounddown(KASLR_WINDOW_BASE + rnd % (KASLR_WINDOW_SIZE - size),
PAGE_SIZE);
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.99 src/sys/arch/x86/x86/x86_machdep.c:1.100
--- src/sys/arch/x86/x86/x86_machdep.c:1.99 Sun Oct 22 01:29:26 2017
+++ src/sys/arch/x86/x86/x86_machdep.c Mon Oct 23 06:00:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.99 2017/10/22 01:29:26 maya Exp $ */
+/* $NetBSD: x86_machdep.c,v 1.100 2017/10/23 06:00:59 maxv Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.99 2017/10/22 01:29:26 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.100 2017/10/23 06:00:59 maxv Exp $");
#include "opt_modular.h"
#include "opt_physmem.h"
@@ -886,7 +886,7 @@ int
init_x86_vm(paddr_t pa_kend)
{
extern struct bootspace bootspace;
- paddr_t pa_kstart = bootspace.text.pa;
+ paddr_t pa_kstart = bootspace.text.pa; /* XXX head instead */
uint64_t seg_start, seg_end;
uint64_t seg_start1, seg_end1;
int x;
