The branch stable/12 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=4bce44bdac3e821630032ef13e80562c7919a66a
commit 4bce44bdac3e821630032ef13e80562c7919a66a Author: Mateusz Guzik <[email protected]> AuthorDate: 2021-07-21 12:06:34 +0000 Commit: Mateusz Guzik <[email protected]> CommitDate: 2021-07-21 12:06:34 +0000 arm: hide pc_mpidr behind #if __ARM_ARCH >= 6 This is a direct commit. Unbreaks the build of: DB-78XXX DB-88F5XXX DB-88F6XXX RT1310 LINT-V5 TS7800 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/arm/arm/machdep.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index a1354f303b3a..7aa19ceb3275 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -378,7 +378,9 @@ void cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size) { +#if __ARM_ARCH >= 6 pcpu->pc_mpidr = 0xffffffff; +#endif } void @@ -765,7 +767,9 @@ pcpu0_init(void) set_curthread(&thread0); #endif pcpu_init(pcpup, 0, sizeof(struct pcpu)); +#if __ARM_ARCH >= 6 pcpup->pc_mpidr = cp15_mpidr_get() & 0xFFFFFF; +#endif PCPU_SET(curthread, &thread0); } _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
