From c6db807f8dd07aa212999feacfd98b0b9884409f Mon Sep 17 00:00:00 2001 From: tb Date: Thu, 30 May 2024 04:16:25 +0000 Subject: [PATCH] arm64: move cpu_suspended out of #ifdef SUSPEND Matches amd64 and i386 and unbreaks the RAMDISK build ok deraadt --- sys/arch/arm64/arm64/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arch/arm64/arm64/cpu.c b/sys/arch/arm64/arm64/cpu.c index 23efaa4f26e..a41b7697d14 100644 --- a/sys/arch/arm64/arm64/cpu.c +++ b/sys/arch/arm64/arm64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.117 2024/05/29 15:32:06 jsg Exp $ */ +/* $OpenBSD: cpu.c,v 1.118 2024/05/30 04:16:25 tb Exp $ */ /* * Copyright (c) 2016 Dale Rahn @@ -1485,13 +1485,14 @@ cpu_unidle(struct cpu_info *ci) #endif +int cpu_suspended; + #ifdef SUSPEND void cpu_hatch_primary(void); void (*cpu_suspend_cycle_fcn)(void) = cpu_wfi; label_t cpu_suspend_jmpbuf; -int cpu_suspended; void cpu_suspend_cycle(void) -- 2.20.1