[src/trunk]: src/sys/arch/arm/include Oops... deal with a last minute #define...

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

details:   https://anonhg.NetBSD.org/src/rev/49adce8e6b9f
branches:  trunk
changeset: 935846:49adce8e6b9f
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jul 10 12:45:15 2020 +0000

description:
Oops... deal with a last minute #define name change.  KASAN support now
builds.

diffstat:

 sys/arch/arm/include/arm32/vmparam.h |  4 ++--
 sys/arch/arm/include/asan.h          |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 6a4e46c9ba8a -r 49adce8e6b9f sys/arch/arm/include/arm32/vmparam.h
--- a/sys/arch/arm/include/arm32/vmparam.h      Fri Jul 10 12:25:08 2020 +0000
+++ b/sys/arch/arm/include/arm32/vmparam.h      Fri Jul 10 12:45:15 2020 +0000
@@ -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
diff -r 6a4e46c9ba8a -r 49adce8e6b9f sys/arch/arm/include/asan.h
--- a/sys/arch/arm/include/asan.h       Fri Jul 10 12:25:08 2020 +0000
+++ b/sys/arch/arm/include/asan.h       Fri Jul 10 12:45:15 2020 +0000
@@ -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 @@
        /* 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);
 }