[src/trunk]: src/sys/arch/aarch64/include Fix a last minute rebase/merge botc...

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

details:   https://anonhg.NetBSD.org/src/rev/641529721997
branches:  trunk
changeset: 1024730:641529721997
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Nov 01 08:53:40 2021 +0000

description:
Fix a last minute rebase/merge botch so that the cpu_hatch commit actually
works.

diffstat:

 sys/arch/aarch64/include/cpu.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 4703d80757e9 -r 641529721997 sys/arch/aarch64/include/cpu.h
--- a/sys/arch/aarch64/include/cpu.h    Mon Nov 01 08:35:17 2021 +0000
+++ b/sys/arch/aarch64/include/cpu.h    Mon Nov 01 08:53:40 2021 +0000
@@ -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 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)