From 96b227e70fed261cf226809746a9093d3bb77ae1 Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Sat, 5 Aug 2023 05:46:36 +0000
Subject: [PATCH] cpu_idle_{enter,leave} are no-ops on mips64, so just #define
 away the calls

ok jca@
---
 sys/arch/mips64/include/cpu.h    |  4 +++-
 sys/arch/mips64/mips64/context.S | 12 +-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index 3a1ca4191e9..4b9f1940a94 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.142 2023/07/25 18:16:20 cheloha Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.143 2023/08/05 05:46:36 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -217,6 +217,8 @@ extern struct cpu_info *cpu_info_list;
 
 #define CPU_INFO_UNIT(ci)               ((ci)->ci_dev ? (ci)->ci_dev->dv_unit : 0)
 
+#define	cpu_idle_enter()	do { /* nothing */ } while (0)
+#define	cpu_idle_leave()	do { /* nothing */ } while (0)
 extern void (*cpu_idle_cycle_func)(void);
 #define cpu_idle_cycle()		(*cpu_idle_cycle_func)()
 
diff --git a/sys/arch/mips64/mips64/context.S b/sys/arch/mips64/mips64/context.S
index eb6443f5327..c4757ef3d89 100644
--- a/sys/arch/mips64/mips64/context.S
+++ b/sys/arch/mips64/mips64/context.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: context.S,v 1.64 2022/12/08 01:25:45 guenther Exp $ */
+/*	$OpenBSD: context.S,v 1.65 2023/08/05 05:46:36 guenther Exp $ */
 
 /*
  * Copyright (c) 2002-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -66,16 +66,6 @@ LEAF(savectx, 0)
 	 move	v0, zero
 END(savectx)
 
-LEAF(cpu_idle_enter, 0)
-	j	ra
-	 NOP
-END(cpu_idle_enter)
-
-LEAF(cpu_idle_leave, 0)
-	j	ra
-	 NOP
-END(cpu_idle_leave)
-
 LEAF(cpu_idle_cycle_nop, 0)
 	j	ra
 	 NOP
-- 
2.20.1