diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-04-25 18:11:37 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-04-25 18:11:37 +0000 |
| commit | c4080e11ea7e65c54eb4e2012a3e56e414814652 (patch) | |
| tree | e4d82fcd379661326877bfc1d9cca3aa96cf9528 /sys | |
| parent | 0f893636cbf65a2b4b53ef0e84c44a6612ce4bd8 (diff) | |
Do not include <machine/intr.h> from <sh/psl.h>, and fix <sh/cpu.h> which
used to depend on <sh/psl.h> bringing <machine/intr.h>.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sh/include/cpu.h | 4 | ||||
| -rw-r--r-- | sys/arch/sh/include/psl.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/sh/include/cpu.h b/sys/arch/sh/include/cpu.h index 939af15b246..7311e10f37f 100644 --- a/sys/arch/sh/include/cpu.h +++ b/sys/arch/sh/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.19 2009/03/26 17:24:33 oga Exp $ */ +/* $OpenBSD: cpu.h,v 1.20 2010/04/25 18:11:36 miod Exp $ */ /* $NetBSD: cpu.h,v 1.41 2006/01/21 04:24:12 uwe Exp $ */ /*- @@ -54,7 +54,9 @@ * Per-CPU information. */ +#include <machine/intr.h> #include <sys/sched.h> + struct cpu_info { struct proc *ci_curproc; diff --git a/sys/arch/sh/include/psl.h b/sys/arch/sh/include/psl.h index 55f0b802193..1bba70675e1 100644 --- a/sys/arch/sh/include/psl.h +++ b/sys/arch/sh/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.3 2007/02/26 19:34:41 miod Exp $ */ +/* $OpenBSD: psl.h,v 1.4 2010/04/25 18:11:36 miod Exp $ */ /* $NetBSD: psl.h,v 1.8 2005/12/11 12:18:58 christos Exp $ */ /*- @@ -39,7 +39,7 @@ #define _SH_PSL_H_ /* - * SuperH Processer Status Register. + * SuperH Processor Status Register. */ #define PSL_TBIT 0x00000001 /* T bit */ #define PSL_SBIT 0x00000002 /* S bit */ @@ -69,8 +69,6 @@ int _cpu_intr_resume(int); int _cpu_exception_suspend(void); void _cpu_exception_resume(int); #endif /* !_LOCORE */ - -#include <machine/intr.h> #endif /* _KERNEL */ #endif /* !_SH_PSL_H_ */ |