Module Name: src
Committed By: maxv
Date: Sun Jan 21 10:59:21 UTC 2018
Modified Files:
src/sys/arch/amd64/include: pmap.h
src/sys/arch/amd64/stand/prekern: pdir.h
Log Message:
Increase the size of the initial mapping of the kernel. KASLR kernels are
bigger than their GENERIC counterparts, and the limit will soon be hit on
them.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amd64/include/pmap.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/stand/prekern/pdir.h
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/include/pmap.h
diff -u src/sys/arch/amd64/include/pmap.h:1.41 src/sys/arch/amd64/include/pmap.h:1.42
--- src/sys/arch/amd64/include/pmap.h:1.41 Sun Jan 7 16:10:16 2018
+++ src/sys/arch/amd64/include/pmap.h Sun Jan 21 10:59:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.41 2018/01/07 16:10:16 maxv Exp $ */
+/* $NetBSD: pmap.h,v 1.42 2018/01/21 10:59:21 maxv Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -176,7 +176,7 @@
#define NKL4_KIMG_ENTRIES 1
#define NKL3_KIMG_ENTRIES 1
-#define NKL2_KIMG_ENTRIES 32
+#define NKL2_KIMG_ENTRIES 48
/*
* Since kva space is below the kernel in its entirety, we start off
Index: src/sys/arch/amd64/stand/prekern/pdir.h
diff -u src/sys/arch/amd64/stand/prekern/pdir.h:1.3 src/sys/arch/amd64/stand/prekern/pdir.h:1.4
--- src/sys/arch/amd64/stand/prekern/pdir.h:1.3 Fri Nov 17 07:07:52 2017
+++ src/sys/arch/amd64/stand/prekern/pdir.h Sun Jan 21 10:59:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pdir.h,v 1.3 2017/11/17 07:07:52 maxv Exp $ */
+/* $NetBSD: pdir.h,v 1.4 2018/01/21 10:59:21 maxv Exp $ */
/*
* Copyright (c) 2017 The NetBSD Foundation, Inc. All rights reserved.
@@ -46,7 +46,7 @@
#define NKL4_KIMG_ENTRIES 1
#define NKL3_KIMG_ENTRIES 1
-#define NKL2_KIMG_ENTRIES 32
+#define NKL2_KIMG_ENTRIES 48
/*
* Now we define various constants for playing with virtual addresses.
