Thu May 27 06:11:20 2021 UTC ()
fix build error with options ARMV85_BTI


(ryo)
diff -r1.4 -r1.5 src/sys/arch/aarch64/aarch64/procfs_machdep.c
diff -r1.19 -r1.20 src/sys/arch/aarch64/include/cpufunc.h

cvs diff -r1.4 -r1.5 src/sys/arch/aarch64/aarch64/procfs_machdep.c (expand / switch to context diff)
--- src/sys/arch/aarch64/aarch64/procfs_machdep.c 2020/10/01 07:31:27 1.4
+++ src/sys/arch/aarch64/aarch64/procfs_machdep.c 2021/05/27 06:11:20 1.5
@@ -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>
@@ -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)					\

cvs diff -r1.19 -r1.20 src/sys/arch/aarch64/include/cpufunc.h (expand / switch to context diff)
--- src/sys/arch/aarch64/include/cpufunc.h 2020/12/04 08:29:11 1.19
+++ src/sys/arch/aarch64/include/cpufunc.h 2021/05/27 06:11:20 1.20
@@ -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>
@@ -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;