Module Name: src
Committed By: skrll
Date: Wed Sep 16 18:26:15 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: aarch64_machdep.c
src/sys/arch/aarch64/include: vmparam.h
Log Message:
G/C AARCH64_KMEMORY_BASE
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/aarch64/aarch64/aarch64_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/aarch64/include/vmparam.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/aarch64/aarch64/aarch64_machdep.c
diff -u src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.47 src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.48
--- src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.47 Wed Sep 16 18:24:57 2020
+++ src/sys/arch/aarch64/aarch64/aarch64_machdep.c Wed Sep 16 18:26:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_machdep.c,v 1.47 2020/09/16 18:24:57 skrll Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.48 2020/09/16 18:26:15 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.47 2020/09/16 18:24:57 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.48 2020/09/16 18:26:15 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_cpuoptions.h"
@@ -216,7 +216,6 @@ cpu_kernel_vm_init(uint64_t memory_start
* 0xffff_bfff_ffff_ffff End of direct mapped
* 0xffff_0000_0000_0000 Start of direct mapped
* = AARCH64_KSEG_START
- * = AARCH64_KMEMORY_BASE
*
* Hole: 0xfffe_ffff_ffff_ffff
* 0x0001_0000_0000_0000
Index: src/sys/arch/aarch64/include/vmparam.h
diff -u src/sys/arch/aarch64/include/vmparam.h:1.12 src/sys/arch/aarch64/include/vmparam.h:1.13
--- src/sys/arch/aarch64/include/vmparam.h:1.12 Wed Jul 8 08:20:05 2020
+++ src/sys/arch/aarch64/include/vmparam.h Wed Sep 16 18:26:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.12 2020/07/08 08:20:05 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.13 2020/09/16 18:26:15 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -173,7 +173,6 @@
#define AARCH64_KSEG_SIZE (1UL << 46) /* 64TB */
#define AARCH64_KSEG_START AARCH64_KSEG_MASK
#define AARCH64_KSEG_END (AARCH64_KSEG_START + AARCH64_KSEG_SIZE)
-#define AARCH64_KMEMORY_BASE AARCH64_KSEG_MASK
#define AARCH64_KVA_P(va) (((vaddr_t) (va) & AARCH64_KSEG_MASK) != 0)
#define AARCH64_PA_TO_KVA(pa) ((vaddr_t) ((pa) | AARCH64_KSEG_START))
#define AARCH64_KVA_TO_PA(va) ((paddr_t) ((va) & ~AARCH64_KSEG_MASK))
