[src/trunk]: src/sys/arch/aarch64 fix build error with options ARMV85_BTI

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

details:   https://anonhg.NetBSD.org/src/rev/ec7e622170ef
branches:  trunk
changeset: 983489:ec7e622170ef
user:      ryo <ryo%NetBSD.org@localhost>
date:      Thu May 27 06:11:20 2021 +0000

description:
fix build error with options ARMV85_BTI

diffstat:

 sys/arch/aarch64/aarch64/procfs_machdep.c |  6 +++---
 sys/arch/aarch64/include/cpufunc.h        |  3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r f8ba3ddea8ed -r ec7e622170ef sys/arch/aarch64/aarch64/procfs_machdep.c
--- a/sys/arch/aarch64/aarch64/procfs_machdep.c Thu May 27 04:55:34 2021 +0000
+++ b/sys/arch/aarch64/aarch64/procfs_machdep.c Thu May 27 06:11:20 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_machdep.c,v 1.4 2020/10/01 07:31:27 skrll Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.5 2021/05/27 06:11:20 ryo Exp $ */
 
 /*-
  * Copyright (c) 2020 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.4 2020/10/01 07:31:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.5 2021/05/27 06:11:20 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -36,7 +36,7 @@
 #include <miscfs/procfs/procfs.h>
 
 #include <aarch64/armreg.h>
-
+#include <aarch64/cpufunc.h>
 
 /* use variables named 'buf', 'left', 'total' */
 #define FORWARD_BUF(_len)                                      \
diff -r f8ba3ddea8ed -r ec7e622170ef sys/arch/aarch64/include/cpufunc.h
--- a/sys/arch/aarch64/include/cpufunc.h        Thu May 27 04:55:34 2021 +0000
+++ b/sys/arch/aarch64/include/cpufunc.h        Thu May 27 06:11:20 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.h,v 1.19 2020/12/04 08:29:11 skrll Exp $       */
+/*     $NetBSD: cpufunc.h,v 1.20 2021/05/27 06:11:20 ryo Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -63,6 +63,7 @@
 extern u_int aarch64_cache_prefer_mask;
 extern u_int cputype;                  /* compat arm */
 
+extern int aarch64_bti_enabled;
 extern int aarch64_pan_enabled;
 extern int aarch64_pac_enabled;