diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2004-06-20 06:47:32 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2004-06-20 06:47:32 +0000 |
| commit | bd9a9fb90879b3935ff21f0d13dd776954abe71c (patch) | |
| tree | cc2059f03516f25be4cc7b6dfac6ae333c3015aa /sys/arch | |
| parent | 107ab1c86e995332dbaf688211ff37c5f4a12740 (diff) | |
Move schedstate_percpu into sched.h so that we don't have to include
proc.h in cpu.h on __HAVE_CPU_INFO architectures. cpu.h is usually included
in param.h.
This also removes the horrible kludge with ifdef SYS_PROC_H in sched.h
by simply converting the inline functions into macros.
With a few suggestions from nordin@
deraadt@ ok
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/include/cpu.h | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/include/cpu.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index 9d66a9c496c..47dbd06e31e 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.61 2004/06/13 21:49:16 niklas Exp $ */ +/* $OpenBSD: cpu.h,v 1.62 2004/06/20 06:47:31 art Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -72,7 +72,7 @@ #include <sys/device.h> #include <sys/lock.h> /* will also get LOCKDEBUG */ -#include <sys/proc.h> +#include <sys/sched.h> struct intrsource; diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h index 278f7a3031b..4d408ab68cd 100644 --- a/sys/arch/sparc64/include/cpu.h +++ b/sys/arch/sparc64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.25 2004/06/13 21:49:20 niklas Exp $ */ +/* $OpenBSD: cpu.h,v 1.26 2004/06/20 06:47:31 art Exp $ */ /* $NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */ /* @@ -75,7 +75,7 @@ #include <machine/reg.h> #include <machine/intr.h> -#include <sys/proc.h> +#include <sys/sched.h> /* * The cpu_info structure is part of a 64KB structure mapped both the kernel |