[src/trunk]: src/sys/arch/amd64 Increase the size of the initial mapping of t...

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

details:   https://anonhg.NetBSD.org/src/rev/193ad00c03e7
branches:  trunk
changeset: 358886:193ad00c03e7
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun Jan 21 10:59:21 2018 +0000

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

diffstat:

 sys/arch/amd64/include/pmap.h       |  4 ++--
 sys/arch/amd64/stand/prekern/pdir.h |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r ae5794c8b4ce -r 193ad00c03e7 sys/arch/amd64/include/pmap.h
--- a/sys/arch/amd64/include/pmap.h     Sun Jan 21 10:30:51 2018 +0000
+++ b/sys/arch/amd64/include/pmap.h     Sun Jan 21 10:59:21 2018 +0000
@@ -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
diff -r ae5794c8b4ce -r 193ad00c03e7 sys/arch/amd64/stand/prekern/pdir.h
--- a/sys/arch/amd64/stand/prekern/pdir.h       Sun Jan 21 10:30:51 2018 +0000
+++ b/sys/arch/amd64/stand/prekern/pdir.h       Sun Jan 21 10:59:21 2018 +0000
@@ -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.