diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-05-22 20:37:55 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-05-22 20:37:55 +0000 |
| commit | 1b14b5a0ab8f44cf9a7b23dc41ac7f7c7f936f5e (patch) | |
| tree | 31686a5942b4a3de180cd3e1330eb2a520ea972f /sys/arch/mips64/include/cpu.h | |
| parent | 936eacbd2167cd2794d8383ba8aaca7d7409636a (diff) | |
Drop almost unused <machine/psl.h> on sgi; move USERMODE() definition from
there to trap.c which is its only user. This also cleans up multiple
inclusion of <machine/cpu.h> (because <machine/psl.h> includes it) in many
places.
Diffstat (limited to 'sys/arch/mips64/include/cpu.h')
| -rw-r--r-- | sys/arch/mips64/include/cpu.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h index ae9f62855b8..a2965f4ffe5 100644 --- a/sys/arch/mips64/include/cpu.h +++ b/sys/arch/mips64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.30 2009/03/26 17:24:33 oga Exp $ */ +/* $OpenBSD: cpu.h,v 1.31 2009/05/22 20:37:53 miod Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -45,8 +45,6 @@ #ifndef _MIPS_CPU_H_ #define _MIPS_CPU_H_ -#include <machine/psl.h> - /* * MIPS32-style segment definitions. * They only cover the first 512MB of physical addresses. @@ -386,6 +384,8 @@ extern struct cpu_info cpu_info_primary; #define cpu_number() 0 #include <machine/frame.h> +#include <machine/intr.h> + /* * Arguments to hardclock and gatherstats encapsulate the previous * machine state in an opaque clockframe. @@ -563,7 +563,6 @@ void setsoftintr1(void); void clearsoftintr1(void); u_int32_t enableintr(void); u_int32_t disableintr(void); -u_int32_t updateimask(intrmask_t); void setsr(u_int32_t); u_int32_t getsr(void); |