Module Name: src
Committed By: skrll
Date: Mon Nov 1 08:53:40 UTC 2021
Modified Files:
src/sys/arch/aarch64/include: cpu.h
Log Message:
Fix a last minute rebase/merge botch so that the cpu_hatch commit actually
works.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/aarch64/include/cpu.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/include/cpu.h
diff -u src/sys/arch/aarch64/include/cpu.h:1.43 src/sys/arch/aarch64/include/cpu.h:1.44
--- src/sys/arch/aarch64/include/cpu.h:1.43 Sun Oct 31 16:23:47 2021
+++ src/sys/arch/aarch64/include/cpu.h Mon Nov 1 08:53:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.43 2021/10/31 16:23:47 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.44 2021/11/01 08:53:40 skrll Exp $ */
/*-
* Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
@@ -168,7 +168,7 @@ struct cpu_info {
struct aarch64_sysctl_cpu_id ci_id;
/* cache information and function pointers */
- struct aarch64_cache_info *ci_cacheinfo;
+ struct aarch64_cache_info ci_cacheinfo[MAX_CACHE_LEVEL];
struct aarch64_cpufuncs ci_cpufuncs;
#if defined(GPROF) && defined(MULTIPROCESSOR)
