Module Name: src
Committed By: ryo
Date: Thu May 27 06:11:20 UTC 2021
Modified Files:
src/sys/arch/aarch64/aarch64: procfs_machdep.c
src/sys/arch/aarch64/include: cpufunc.h
Log Message:
fix build error with options ARMV85_BTI
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/aarch64/procfs_machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/aarch64/include/cpufunc.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/procfs_machdep.c
diff -u src/sys/arch/aarch64/aarch64/procfs_machdep.c:1.4 src/sys/arch/aarch64/aarch64/procfs_machdep.c:1.5
--- src/sys/arch/aarch64/aarch64/procfs_machdep.c:1.4 Thu Oct 1 07:31:27 2020
+++ src/sys/arch/aarch64/aarch64/procfs_machdep.c Thu May 27 06:11:20 2021
@@ -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 <[email protected]>
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
#include <miscfs/procfs/procfs.h>
#include <aarch64/armreg.h>
-
+#include <aarch64/cpufunc.h>
/* use variables named 'buf', 'left', 'total' */
#define FORWARD_BUF(_len) \
Index: src/sys/arch/aarch64/include/cpufunc.h
diff -u src/sys/arch/aarch64/include/cpufunc.h:1.19 src/sys/arch/aarch64/include/cpufunc.h:1.20
--- src/sys/arch/aarch64/include/cpufunc.h:1.19 Fri Dec 4 08:29:11 2020
+++ src/sys/arch/aarch64/include/cpufunc.h Thu May 27 06:11:20 2021
@@ -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 <[email protected]>
@@ -63,6 +63,7 @@ extern u_int aarch64_cache_vindexsize; /
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;
