diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-02-12 05:31:59 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-02-12 05:31:59 +0000 |
| commit | ec955fc66522bb973747bfb4408e883be40b696f (patch) | |
| tree | 23c44322ecb6a59a6e28cacaa607d047179c2369 /sys/arch | |
| parent | 6117ff4c27fcf66a197a9651b4cf2ee8bcc78da9 (diff) | |
Do not include pmap.h from .S code, but get the necessary defines from
assym.h; similar to recent changes to armv7; spotted by ratchov@ and bmercer@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/zaurus/conf/Makefile.zaurus | 3 | ||||
| -rw-r--r-- | sys/arch/zaurus/zaurus/zaurus_start.S | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus index 1fbcf7feb2d..f6388dfb7da 100644 --- a/sys/arch/zaurus/conf/Makefile.zaurus +++ b/sys/arch/zaurus/conf/Makefile.zaurus @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.zaurus,v 1.49 2013/10/15 19:23:31 guenther Exp $ +# $OpenBSD: Makefile.zaurus,v 1.50 2014/02/12 05:31:58 miod Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -146,6 +146,7 @@ ${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S locore.o: ${_archdir}/${_arch}/locore.S assym.h in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o: assym.h vectors.o cpuswitch.o exception.o bcopy_page.o irq_dispatch.o: assym.h +zaurus_start.o: assym.h # The install target can be redefined by putting a # install-kernel-${MACHINE_NAME} target into /etc/mk.conf diff --git a/sys/arch/zaurus/zaurus/zaurus_start.S b/sys/arch/zaurus/zaurus/zaurus_start.S index b8eafafe2bf..228ec65cac7 100644 --- a/sys/arch/zaurus/zaurus/zaurus_start.S +++ b/sys/arch/zaurus/zaurus/zaurus_start.S @@ -1,4 +1,4 @@ -/* $OpenBSD: zaurus_start.S,v 1.2 2005/01/02 19:43:07 drahn Exp $ */ +/* $OpenBSD: zaurus_start.S,v 1.3 2014/02/12 05:31:58 miod Exp $ */ /* $NetBSD: lubbock_start.S,v 1.1 2003/06/18 10:51:15 bsh Exp $ */ /* @@ -33,7 +33,9 @@ #include <machine/asm.h> #include <arm/armreg.h> #include <arm/pte.h> -#include <arm/pmap.h> /* for PMAP_DOMAIN_KERNEL */ + +#undef DOMAIN_CLIENT /* XXX */ +#include "assym.h" #ifndef SDRAM_START #define SDRAM_START 0xa0000000 |