Module Name: src
Committed By: jmcneill
Date: Tue Dec 10 11:27:29 UTC 2024
Modified Files:
src/sys/arch/aarch64/include: cpu.h
src/sys/arch/arm/arm: arm_cpu_topology.c
Log Message:
fix 32-bit arm builds
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/aarch64/include/cpu.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/arm_cpu_topology.c
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.51 src/sys/arch/aarch64/include/cpu.h:1.52
--- src/sys/arch/aarch64/include/cpu.h:1.51 Sat Aug 10 15:20:59 2024
+++ src/sys/arch/aarch64/include/cpu.h Tue Dec 10 11:27:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.51 2024/08/10 15:20:59 riastradh Exp $ */
+/* $NetBSD: cpu.h,v 1.52 2024/12/10 11:27:28 jmcneill Exp $ */
/*-
* Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
@@ -172,6 +172,7 @@ struct cpu_info {
/* sysctl(9) exposed system registers */
struct aarch64_sysctl_cpu_id ci_id;
+#define ci_midr ci_id.ac_midr
/* cache information and function pointers */
struct aarch64_cache_info ci_cacheinfo[MAX_CACHE_LEVEL];
Index: src/sys/arch/arm/arm/arm_cpu_topology.c
diff -u src/sys/arch/arm/arm/arm_cpu_topology.c:1.8 src/sys/arch/arm/arm/arm_cpu_topology.c:1.9
--- src/sys/arch/arm/arm/arm_cpu_topology.c:1.8 Mon Dec 9 21:55:06 2024
+++ src/sys/arch/arm/arm/arm_cpu_topology.c Tue Dec 10 11:27:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_cpu_topology.c,v 1.8 2024/12/09 21:55:06 jmcneill Exp $ */
+/* $NetBSD: arm_cpu_topology.c,v 1.9 2024/12/10 11:27:29 jmcneill Exp $ */
/*
* Copyright (c) 2020 Matthew R. Green
@@ -31,7 +31,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_cpu_topology.c,v 1.8 2024/12/09 21:55:06 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_cpu_topology.c,v 1.9 2024/12/10 11:27:29 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@ arm_cpu_topology_set(struct cpu_info * c
#ifdef MULTIPROCESSOR
uint pkgid, coreid, smtid, numaid;
bool use_aff0 = (mpidr & MPIDR_MT) != 0 ||
- CPU_ID_ORYON_P(ci->ci_id.ac_midr);
+ CPU_ID_ORYON_P(ci->ci_midr);
/* NUMA info comes from firmware tables (ACPI or FDT). */
numaid = ci->ci_numa_id;
