The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7c1ff7146b7a4474dff370af0c5a5d238a8ff6c6
commit 7c1ff7146b7a4474dff370af0c5a5d238a8ff6c6 Author: John Baldwin <[email protected]> AuthorDate: 2022-04-18 19:08:35 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-04-18 19:08:35 +0000 powerpc cpu_idle_60x: Move some variables fully under #ifdef AIM. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D34905 --- sys/powerpc/powerpc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c index d1fc89b410eb..bc70d39676ef 100644 --- a/sys/powerpc/powerpc/cpu.c +++ b/sys/powerpc/powerpc/cpu.c @@ -737,16 +737,18 @@ cpu_idle(int busy) static void cpu_idle_60x(sbintime_t sbt) { +#ifdef AIM register_t msr; uint16_t vers; +#endif if (!powerpc_pow_enabled) return; +#ifdef AIM msr = mfmsr(); vers = mfpvr() >> 16; -#ifdef AIM switch (vers) { case IBM970: case IBM970FX:
