diff options
| author |   sf <sf@openbsd.org> | 2015-01-15 15:30:17 +0000 |
|---|---|---|
| committer | sf <sf@openbsd.org> | 2015-01-15 15:30:17 +0000 |
| commit | e390af8cab883147a1fd33148cdde3b1e95944ad (patch) | |
| tree | f79015ce6d458e16f4c692170f4ff5d8c40c5c18 | |
| parent | Define and print HV cpuid flag on i386. (diff) | |
| download | wireguard-openbsd-e390af8cab883147a1fd33148cdde3b1e95944ad.tar.xz wireguard-openbsd-e390af8cab883147a1fd33148cdde3b1e95944ad.zip | |
Don't include i82489 headers in cpu.h
Only pmap.c was not including them explicitly. Fix that.
"The direction is good" deraadt@
| -rw-r--r-- | sys/arch/amd64/amd64/pmap.c | 7 | ||||
| -rw-r--r-- | sys/arch/amd64/include/cpu.h | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c index 11a69b75e98..402c6055e6f 100644 --- a/sys/arch/amd64/amd64/pmap.c +++ b/sys/arch/amd64/amd64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.84 2015/01/06 00:38:32 dlg Exp $ */ +/* $OpenBSD: pmap.c,v 1.85 2015/01/15 15:30:17 sf Exp $ */ /* $NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $ */ /* @@ -117,6 +117,11 @@ #include <machine/lock.h> #include <machine/cpu.h> #include <machine/specialreg.h> +#ifdef MULTIPROCESSOR +#include <machine/i82489reg.h> +#include <machine/i82489var.h> +#endif + #include <dev/isa/isareg.h> #include <machine/isa_machdep.h> diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h index b06d58bc096..780948bed4a 100644 --- a/sys/arch/amd64/include/cpu.h +++ b/sys/arch/amd64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.89 2015/01/06 12:50:48 dlg Exp $ */ +/* $OpenBSD: cpu.h,v 1.90 2015/01/15 15:30:17 sf Exp $ */ /* $NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $ */ /*- @@ -46,12 +46,6 @@ #include <machine/segments.h> #include <machine/cacheinfo.h> #include <machine/intrdefs.h> - -#ifdef MULTIPROCESSOR -#include <machine/i82489reg.h> -#include <machine/i82489var.h> -#endif - #endif /* _KERNEL */ #include <sys/device.h> |