Module Name: src
Committed By: skrll
Date: Fri Jul 10 12:45:16 UTC 2020
Modified Files:
src/sys/arch/arm/include: asan.h
src/sys/arch/arm/include/arm32: vmparam.h
Log Message:
Oops... deal with a last minute #define name change. KASAN support now
builds.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/include/asan.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arm/include/arm32/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/arm/include/asan.h
diff -u src/sys/arch/arm/include/asan.h:1.1 src/sys/arch/arm/include/asan.h:1.2
--- src/sys/arch/arm/include/asan.h:1.1 Fri Jul 10 12:25:09 2020
+++ src/sys/arch/arm/include/asan.h Fri Jul 10 12:45:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.1 2020/07/10 12:25:09 skrll Exp $ */
+/* $NetBSD: asan.h,v 1.2 2020/07/10 12:45:15 skrll Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -189,8 +189,8 @@ kasan_md_init(void)
/* The VAs we've created until now. */
vaddr_t eva;
- eva = pmap_growkernel(KERNEL_VM_BASE);
- kasan_shadow_map((void *)KERNEL_VM_BASE, eva - KERNEL_VM_BASE);
+ eva = pmap_growkernel(VM_KERNEL_VM_BASE);
+ kasan_shadow_map((void *)VM_KERNEL_VM_BASE, eva - VM_KERNEL_VM_BASE);
}
Index: src/sys/arch/arm/include/arm32/vmparam.h
diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.51 src/sys/arch/arm/include/arm32/vmparam.h:1.52
--- src/sys/arch/arm/include/arm32/vmparam.h:1.51 Fri Jul 10 12:25:09 2020
+++ src/sys/arch/arm/include/arm32/vmparam.h Fri Jul 10 12:45:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.51 2020/07/10 12:25:09 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.52 2020/07/10 12:45:15 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -124,7 +124,7 @@
#ifdef KASAN
#define VM_KERNEL_KASAN_BASE 0xc0000000
-#define VM_KERNEL_KASAN_SIZE (KERNEL_VM_SIZE >> KASAN_SHADOW_SCALE_SHIFT)
+#define VM_KERNEL_KASAN_SIZE (VM_KERNEL_VM_SIZE >> KASAN_SHADOW_SCALE_SHIFT)
#define VM_KERNEL_KASAN_END (VM_KERNEL_KASAN_BASE + VM_KERNEL_KASAN_SIZE)
#define VM_KERNEL_VM_END VM_KERNEL_KASAN_BASE
#else
