The fact that my tree builds should not prevent the official tree to

build as well... Right now, .s files can't include unmodified <machine/psl.h>

7 files changed, 41 insertions, 7 deletions

diff --git a/sys/arch/amiga/amiga/genassym.cf b/sys/arch/amiga/amiga/genassym.cf
index 7cb95e8d81b..7e6f0b293ef 100644
--- a/sys/arch/amiga/amiga/genassym.cf
+++ b/sys/arch/amiga/amiga/genassym.cf
@@ -1,5 +1,5 @@
 #	$NetBSD: genassym.cf,v 1.3 1997/07/16 00:01:49 is Exp $
-#	$OpenBSD: genassym.cf,v 1.7 2001/08/30 22:10:45 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.8 2001/08/31 00:37:15 miod Exp $
 #
 # Copyright (c) 1982, 1990, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -48,6 +48,7 @@ include <vm/vm.h>
 include <uvm/uvm_extern.h>
 
 include <machine/cpu.h>
+include <machine/psl.h>
 include <machine/reg.h>
 include <machine/vmparam.h>
 include <machine/pte.h>
@@ -109,6 +110,11 @@ define	PGSHIFT		PGSHIFT
 define	USRSTACK	USRSTACK
 
 # PSL values
+define	PSL_S		PSL_S
+define	PSL_IPL7	PSL_IPL7
+define	PSL_IPL		PSL_IPL
+define	PSL_LOWIPL	PSL_LOWIPL
+define	PSL_USER	PSL_USER
 define	SPL1		PSL_S | PSL_IPL1
 define	SPL2		PSL_S | PSL_IPL2
 define	SPL3		PSL_S | PSL_IPL3
diff --git a/sys/arch/hp300/hp300/genassym.cf b/sys/arch/hp300/hp300/genassym.cf
index d7103130e3a..720183c5b12 100644
--- a/sys/arch/hp300/hp300/genassym.cf
+++ b/sys/arch/hp300/hp300/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.10 2001/08/30 22:10:47 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.11 2001/08/31 00:37:20 miod Exp $
 #	$NetBSD: genassym.cf,v 1.11 1998/02/16 20:58:29 thorpej Exp $
 
 #
@@ -51,6 +51,7 @@ include <uvm/uvm_extern.h>
 
 include <machine/hp300spu.h>
 include <machine/cpu.h>
+include <machine/psl.h>
 include <machine/reg.h>
 include <machine/pte.h>
 
@@ -150,6 +151,11 @@ define	SSLEEP			SSLEEP
 define UVMEXP_INTRS		offsetof(struct uvmexp, intrs)
 
 # PSL values
+define	PSL_S			PSL_S
+define	PSL_IPL7		PSL_IPL7
+define	PSL_LOWIPL		PSL_LOWIPL
+define	PSL_USER		PSL_USER
+define	PSL_TS			PSL_T | PSL_S
 define	SPL1			PSL_S | PSL_IPL1
 define	SPL2			PSL_S | PSL_IPL2
 define	SPL3			PSL_S | PSL_IPL3
diff --git a/sys/arch/m68k/m68k/genassym.cf b/sys/arch/m68k/m68k/genassym.cf
index 6fba51e21d3..326aa11f609 100644
--- a/sys/arch/m68k/m68k/genassym.cf
+++ b/sys/arch/m68k/m68k/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.1 2001/08/30 22:08:44 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.2 2001/08/31 00:37:20 miod Exp $
 
 #
 # Copyright (c) 1995 Theo de Raadt
@@ -74,6 +74,7 @@ include <sys/types.h>
 include <sys/user.h>
 
 include <machine/cpu.h>
+include <machine/psl.h>
 
 # general constants
 define	NBPG			NBPG
@@ -90,6 +91,9 @@ define	SRUN			SRUN
 # magic
 define	FC_USERD		FC_USERD
 
+# PSL values
+define	PSL_HIGHIPL		PSL_HIGHIPL
+
 # pcb fields
 define	PCB_ONFAULT		offsetof(struct pcb, pcb_onfault)
 
diff --git a/sys/arch/mac68k/mac68k/genassym.cf b/sys/arch/mac68k/mac68k/genassym.cf
index 1a5f4b1d400..f663b31634e 100644
--- a/sys/arch/mac68k/mac68k/genassym.cf
+++ b/sys/arch/mac68k/mac68k/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.7 2001/08/30 22:10:48 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.8 2001/08/31 00:37:20 miod Exp $
 #	$NetBSD: genassym.cf,v 1.7 1998/01/06 08:46:16 thorpej Exp $
 
 #
@@ -51,6 +51,7 @@ include	<vm/vm.h>
 include <uvm/uvm_extern.h>
 
 include	<machine/cpu.h>
+include	<machine/psl.h>
 include	<machine/reg.h>
 include	<machine/pte.h>
 
@@ -65,6 +66,10 @@ define	USPACE			USPACE
 define	PGSHIFT 		PGSHIFT
 define	USRSTACK		USRSTACK
 
+define	PSL_S		PSL_S
+define	PSL_IPL7	PSL_IPL7
+define	PSL_LOWIPL	PSL_LOWIPL
+define	PSL_USER	PSL_USER
 define	SPL1			(PSL_S | PSL_IPL1)
 define	SPL2			(PSL_S | PSL_IPL2)
 
diff --git a/sys/arch/mvme68k/mvme68k/genassym.cf b/sys/arch/mvme68k/mvme68k/genassym.cf
index 4e9b2c1167b..533d4b22be5 100644
--- a/sys/arch/mvme68k/mvme68k/genassym.cf
+++ b/sys/arch/mvme68k/mvme68k/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.10 2001/08/30 22:10:50 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.11 2001/08/31 00:37:20 miod Exp $
 
 #
 # Copyright (c) 1995 Theo de Raadt
@@ -78,6 +78,7 @@ include <vm/vm.h>
 include <uvm/uvm_extern.h>
 
 include <machine/cpu.h>
+include <machine/psl.h>
 include <machine/nvram.h>
 include <machine/reg.h>
 include <machine/autoconf.h>
@@ -98,6 +99,10 @@ define	P_MD_REGS		offsetof(struct proc, p_md.md_regs)
 define	UVMEXP_INTRS		offsetof(struct uvmexp, intrs)
 
 # PSL values
+define	PSL_S			PSL_S
+define	PSL_IPL7		PSL_IPL7
+define	PSL_LOWIPL		PSL_LOWIPL
+define	PSL_USER		PSL_USER
 define	SPL1			PSL_S | PSL_IPL1
 
 # magic
diff --git a/sys/arch/mvme68k/mvme68k/locore.s b/sys/arch/mvme68k/mvme68k/locore.s
index 5ca36f7b744..cec672c39f1 100644
--- a/sys/arch/mvme68k/mvme68k/locore.s
+++ b/sys/arch/mvme68k/mvme68k/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.27 2001/08/13 00:01:47 miod Exp $ */
+/*	$OpenBSD: locore.s,v 1.28 2001/08/31 00:37:20 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -76,6 +76,7 @@
 #include "ksyms.h"
 #include <machine/asm.h>
 #include <machine/prom.h>
+#include <machine/trap.h>
 
 /*
  * Macro to relocate a symbol, used before MMU is enabled.
diff --git a/sys/arch/sun3/sun3/genassym.cf b/sys/arch/sun3/sun3/genassym.cf
index 80b5360ff17..5e9247503e0 100644
--- a/sys/arch/sun3/sun3/genassym.cf
+++ b/sys/arch/sun3/sun3/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.4 2001/08/30 22:10:52 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.5 2001/08/31 00:37:20 miod Exp $
 #	$NetBSD: genassym.c,v 1.32 1996/10/23 16:39:27 gwr Exp $
 
 #
@@ -53,6 +53,7 @@ include <machine/control.h>
 include <machine/cpu.h>
 include <machine/dvma.h>
 include <machine/pcb.h>
+include <machine/psl.h>
 include <machine/pte.h>
 include <machine/machdep.h>
 include <machine/mon.h>
@@ -77,6 +78,12 @@ define	INTERSIL_INTER_CSECONDS	INTERSIL_INTER_CSECONDS
 define	BUSERR_REG		BUSERR_REG
 define	BUSERR_MMU		BUSERR_MMU
 
+# PSL values
+define	PSL_S			PSL_S
+define	PSL_IPL7		PSL_IPL7
+define	PSL_LOWIPL		PSL_LOWIPL
+define	PSL_USER		PSL_USER
+
 # magic
 define	FC_CONTROL		FC_CONTROL
 define	FC_SUPERD		FC_SUPERD