From 20407c2e8748eea83bab72d483cc4b9598573e96 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Sat, 13 Oct 2007 12:54:46 +0000
Subject: It is no longer necessary to fiddle with spl in
 cpu_idle_{enter,leave} now that proc_trampoline has been fixed.

---
 sys/arch/m88k/include/cpu.h  |  4 +++-
 sys/arch/m88k/m88k/process.S | 26 +-------------------------
 2 files changed, 4 insertions(+), 26 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h
index ab3342c7734..8804f92ba41 100644
--- a/sys/arch/m88k/include/cpu.h
+++ b/sys/arch/m88k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.23 2007/10/10 15:53:52 art Exp $ */
+/*	$OpenBSD: cpu.h,v 1.24 2007/10/13 12:54:43 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -166,7 +166,9 @@ void	set_cpu_number(cpuid_t);
 #define	cpu_exec(p)		do { /* nothing */ } while (0)
 #define	cpu_wait(p)		do { /* nothing */ } while (0)
 
+#define	cpu_idle_enter()	do { /* nothing */ } while (0)
 #define	cpu_idle_cycle()	do { /* nothing */ } while (0)
+#define	cpu_idle_leave()	do { /* nothing */ } while (0)
 
 #if defined(MULTIPROCESSOR)
 #include <sys/lock.h>
diff --git a/sys/arch/m88k/m88k/process.S b/sys/arch/m88k/m88k/process.S
index 786b40d5c38..a0d4eec97d4 100644
--- a/sys/arch/m88k/m88k/process.S
+++ b/sys/arch/m88k/m88k/process.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.S,v 1.17 2007/10/10 15:53:52 art Exp $	*/
+/*	$OpenBSD: process.S,v 1.18 2007/10/13 12:54:45 miod Exp $	*/
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -35,30 +35,6 @@
 #include <machine/psl.h>
 #include <machine/intr.h>
 
-/*
- * void cpu_idle_enter()
- *
- * Enable all interrupts and lower spl. This actually enables interrupts
- * in the psr; bootstrap of secondary processors depends on this.
- */
-ENTRY(cpu_idle_enter)
-	ldcr	r2, PSR
-	clr	r2, r2, 1<PSR_INTERRUPT_DISABLE_BIT>
-	stcr	r2, PSR
-	FLUSH_PIPELINE
-
-	br.n	_C_LABEL(setipl)
-	 or	r2, r0, IPL_NONE
-
-/*
- * void cpu_idle_leave()
- *
- * Raise ipl to IPL_SCHED, but do not attempt to disable interrupts.
- */
-ENTRY(cpu_idle_leave)
-	br.n	_C_LABEL(setipl)
-	 or	r2, r0, IPL_SCHED
-
 /*
  * void cpu_switchto(struct proc *oldproc, struct proc *newproc)
  *
-- 
cgit v1.2.3