From e67052d56867e39cde3445ba50a65d855604d804 Mon Sep 17 00:00:00 2001
From: Michael Shalayeff <mickey@cvs.openbsd.org>
Date: Tue, 19 Apr 2005 15:14:12 +0000
Subject: CLKF_BASEPRI we do not have no more; noticed by miod

---
 sys/arch/amd64/include/cpu.h |  3 +--
 sys/arch/arm/include/cpu.h   | 11 +----------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index 9f5d9958679..d66db3f5da1 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.10 2004/06/25 17:27:01 andreas Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.11 2005/04/19 15:14:11 mickey Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $	*/
 
 /*-
@@ -213,7 +213,6 @@ extern u_int32_t cpus_attached;
 #define clockframe intrframe
 
 #define	CLKF_USERMODE(frame)	USERMODE((frame)->if_cs, (frame)->if_rflags)
-#define CLKF_BASEPRI(frame)	(0)
 #define CLKF_PC(frame)		((frame)->if_rip)
 #define CLKF_INTR(frame)	(curcpu()->ci_idepth > 1)
 
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index 163ba0aa345..20b1954f385 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.7 2005/03/29 20:00:16 uwe Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.8 2005/04/19 15:14:11 mickey Exp $	*/
 /*	$NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $	*/
 
 /*
@@ -136,15 +136,6 @@ extern int cpu_do_powersave;
 #define CLKF_USERMODE(frame)	((frame->if_r15 & R15_MODE) == R15_MODE_USR)
 #endif
 
-/*
- * CLKF_BASEPRI: True if we were at spl0 before the interrupt.
- *
- * This is hard-wired to 0 on the ARM, since spllowersoftclock() might
- * not actually be able to unblock the interrupt, which would cause us
- * to run the softclock interrupts with hardclock blocked.
- */
-#define CLKF_BASEPRI(frame)	0
-
 /*
  * CLKF_INTR: True if we took the interrupt from inside another
  * interrupt handler.
-- 
cgit v1.2.3