summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2007-06-01 21:01:52 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2007-06-01 21:01:52 +0000
commit2f186764b8b4978194c8257c8aed4e242a1b4e3a (patch)
tree3a519305ebe5ead526c6c1ea7d1f40a63f46fc6c
parenta1cbb27f3cb543ff752065c73d7bcc1191de7fbb (diff)
Instead of reexporting PAGE_SIZE from assym.h which causes warnings
for locore, just include machine/param.h in vector.S
-rw-r--r--sys/arch/amd64/amd64/genassym.cf3
-rw-r--r--sys/arch/amd64/amd64/vector.S3
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/genassym.cf b/sys/arch/amd64/amd64/genassym.cf
index 934f707e79d..1632d9b7c8f 100644
--- a/sys/arch/amd64/amd64/genassym.cf
+++ b/sys/arch/amd64/amd64/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.13 2007/05/27 08:58:31 art Exp $
+# $OpenBSD: genassym.cf,v 1.14 2007/06/01 21:01:51 art Exp $
# Written by Artur Grabowski art@openbsd.org, Public Domain
include <sys/param.h>
@@ -161,4 +161,3 @@ export PDIR_SLOT_DIRECT
export CR4_DEFAULT
-export PAGE_SIZE
diff --git a/sys/arch/amd64/amd64/vector.S b/sys/arch/amd64/amd64/vector.S
index 465c2c00775..145b5c23608 100644
--- a/sys/arch/amd64/amd64/vector.S
+++ b/sys/arch/amd64/amd64/vector.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: vector.S,v 1.9 2007/05/25 16:22:11 art Exp $ */
+/* $OpenBSD: vector.S,v 1.10 2007/06/01 21:01:51 art Exp $ */
/* $NetBSD: vector.S,v 1.5 2004/06/28 09:13:11 fvdl Exp $ */
/*
@@ -74,6 +74,7 @@
#define ALIGN_TEXT .align 16,0x90
+#include <machine/param.h>
#include <machine/i8259.h>
#include <machine/i82093reg.h>
#include <machine/i82489reg.h>