cpu_idle_{enter,leave}() are no-ops in ASM; replace them

with no-op macros.

ok gkoehler@

diff --git a/sys/arch/powerpc64/include/cpu.h b/sys/arch/powerpc64/include/cpu.h
index 0a8cdb3..b025539 100644 (file)
--- a/sys/arch/powerpc64/include/cpu.h
+++ b/sys/arch/powerpc64/include/cpu.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cpu.h,v 1.33 2022/11/29 01:04:44 cheloha Exp $        */
+/*     $OpenBSD: cpu.h,v 1.34 2023/08/21 01:35:43 guenther Exp $       */
 
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
@@ -184,6 +184,8 @@ extern uint32_t cpu_features2;
 void cpu_init_features(void);
 void cpu_init(void);
 
+#define        cpu_idle_enter()        do { /* nothing */ } while (0)
+#define        cpu_idle_leave()        do { /* nothing */ } while (0)
 extern uint64_t cpu_idle_state_psscr;
 extern void (*cpu_idle_cycle_fcn)(void);
 

diff --git a/sys/arch/powerpc64/powerpc64/locore.S b/sys/arch/powerpc64/powerpc64/locore.S
index 4614372..6c455f7 100644 (file)
--- a/sys/arch/powerpc64/powerpc64/locore.S
+++ b/sys/arch/powerpc64/powerpc64/locore.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: locore.S,v 1.44 2022/03/22 06:51:12 miod Exp $        */
+/*     $OpenBSD: locore.S,v 1.45 2023/08/21 01:35:43 guenther Exp $    */
 
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
@@ -105,10 +105,6 @@ cpu_hatch_and_stop:
 
 #endif
 
-       .globl cpu_idle_enter
-cpu_idle_enter:
-       blr
-
        .globl cpu_idle_spin
 cpu_idle_spin:
        blr
@@ -191,10 +187,6 @@ cpu_idle_restore_context:
        mtsrr0  %r5
        rfid    /* return from system reset interrupt */
 
-       .globl cpu_idle_leave
-cpu_idle_leave:
-       blr
-
        .globl cpu_switchto_asm
 cpu_switchto_asm:
        cmpdi   %r3, 0