diff options
Diffstat (limited to 'sys/arch/mvme88k/include/cpu.h')
| -rw-r--r-- | sys/arch/mvme88k/include/cpu.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h index a2e41ad04cf..f56db0d798c 100644 --- a/sys/arch/mvme88k/include/cpu.h +++ b/sys/arch/mvme88k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.9 2001/03/09 05:44:40 smurph Exp $ */ +/* $OpenBSD: cpu.h,v 1.10 2001/07/01 23:27:46 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 @@ -83,7 +83,7 @@ struct clockframe { extern int intstack; -#define CLKF_USERMODE(framep) ((((struct trapframe *)(framep))->epsr & 80000000) == 0) +#define CLKF_USERMODE(framep) ((((struct trapframe *)(framep))->epsr & PSR_MODE) == 0) #define CLKF_BASEPRI(framep) (((struct trapframe *)(framep))->mask == 0) #define CLKF_PC(framep) (((struct trapframe *)(framep))->sxip & ~3) #define CLKF_INTR(framep) (((struct trapframe *)(framep))->r[31] > intstack) @@ -112,7 +112,6 @@ extern int intstack; #else #define ISIIOVA(va) 1 -#define ackbarf ((char *)(va) >= OBIO_START && (char *)(va) < (OBIO_START + OBIO_SIZE)) #define IIOV(pa) ((pa)) #define IIOP(va) ((va)) #define IIOPOFF(pa) ((int)(pa)-(int)OBIO_START) @@ -127,14 +126,14 @@ extern int intstack; #define siroff(x) (ssir &= ~x) -int ssir; -int want_ast; +extern int ssir; +extern int want_ast; /* * Preempt the current process if in interrupt from user mode, * or after the current trap/syscall if in system mode. */ -int want_resched; /* resched() was called */ +extern int want_resched; /* resched() was called */ #define need_resched() (want_resched = 1, want_ast = 1) /* |