Module Name: src
Committed By: skrll
Date: Sun Feb 2 09:19:48 UTC 2020
Modified Files:
src/sys/arch/arm/arm32: arm32_kvminit.c
src/sys/arch/arm/include/arm32: pte.h
Log Message:
G/C L1_TABLE_SIZE_REAL
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/arm/arm32/arm32_kvminit.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/include/arm32/pte.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/arm/arm32/arm32_kvminit.c
diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.55 src/sys/arch/arm/arm32/arm32_kvminit.c:1.56
--- src/sys/arch/arm/arm32/arm32_kvminit.c:1.55 Wed May 8 13:18:47 2019
+++ src/sys/arch/arm/arm32/arm32_kvminit.c Sun Feb 2 09:19:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_kvminit.c,v 1.55 2019/05/08 13:18:47 skrll Exp $ */
+/* $NetBSD: arm32_kvminit.c,v 1.56 2020/02/02 09:19:48 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -127,7 +127,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.55 2019/05/08 13:18:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.56 2020/02/02 09:19:48 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -460,7 +460,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
*/
size_t kernel_size = bmi->bmi_kernelend;
kernel_size -= (bmi->bmi_kernelstart & -L2_S_SEGSIZE);
- kernel_size += L1_TABLE_SIZE_REAL;
+ kernel_size += L1_TABLE_SIZE;
kernel_size += PAGE_SIZE * KERNEL_L2PT_VMDATA_NUM;
if (map_vectors_p) {
kernel_size += PAGE_SIZE; /* L2PT for VECTORS */
Index: src/sys/arch/arm/include/arm32/pte.h
diff -u src/sys/arch/arm/include/arm32/pte.h:1.21 src/sys/arch/arm/include/arm32/pte.h:1.22
--- src/sys/arch/arm/include/arm32/pte.h:1.21 Sat Jan 18 14:40:04 2020
+++ src/sys/arch/arm/include/arm32/pte.h Sun Feb 2 09:19:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.21 2020/01/18 14:40:04 skrll Exp $ */
+/* $NetBSD: pte.h,v 1.22 2020/02/02 09:19:48 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -138,7 +138,6 @@ typedef uint32_t pt_entry_t; /* L2 table
* keep the old L2_TABLE_SIZE define lying around. Converted ports
* should use L2_TABLE_SIZE_REAL until then.
*/
-#define L1_TABLE_SIZE_REAL 0x4000 /* 16K */
#define L2_TABLE_SIZE_REAL 0x400 /* 1K */
#define L1TT_SIZE 0x2000 /* 8K */