From c3dfa2c9bd2f69e7832f600ffab363df2f1a15de Mon Sep 17 00:00:00 2001
From: Marco S Hyman <marc@cvs.openbsd.org>
Date: Tue, 18 Aug 1998 22:29:11 +0000
Subject: halt processor when idle if either APM is enabled or PCTR is not
 enabled; my idle portable: approx 320000 instructions per second my portable
 during a make build: as high as 21000000 instructions per second

---
 sys/arch/i386/i386/locore.s | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'sys/arch/i386')

diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s
index 1d06b7fd615..94ee6f65322 100644
--- a/sys/arch/i386/i386/locore.s
+++ b/sys/arch/i386/i386/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.43 1998/05/10 18:29:49 deraadt Exp $	*/
+/*	$OpenBSD: locore.s,v 1.44 1998/08/18 22:29:10 marc Exp $	*/
 /*	$NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $	*/
 
 /*-
@@ -1577,14 +1577,13 @@ ENTRY(idle)
 	je	1f
 	call	_apm_cpu_busy
 1:
-#else /* NAPM == 0 */
-#if NPCTR > 0
+#endif
+#if NPCTR > 0 && NAPM == 0
 	addl	$1,_pctr_idlcnt
 	adcl	$0,_pctr_idlcnt+4
-#else /* NPCTR == 0 */
+#else
 	hlt
-#endif /* NPCTR == 0 */
-#endif /* NAPM == 0 */
+#endif
 	jmp	_idle
 
 #ifdef DIAGNOSTIC
-- 
cgit v1.2.3