From 90628de204fdfb510d2d28daf316a7988cfad80f Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Thu, 11 Dec 2003 01:05:09 +0000
Subject: Assimilate ia64 back into the fold with the common freebsd32/ia32
 code. The split-up code is derived from the ia64 code originally.

Note that I have only compile-tested this, not actually run-tested it.
The ia64 side of the force is missing some significant chunks of signal
delivery code.
---
 sys/compat/ia32/ia32_sysvec.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'sys/compat/ia32/ia32_sysvec.c')

diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c
index 9c14fc4..67b7db3 100644
--- a/sys/compat/ia32/ia32_sysvec.c
+++ b/sys/compat/ia32/ia32_sysvec.c
@@ -68,9 +68,15 @@ __FBSDID("$FreeBSD$");
 #include <compat/freebsd32/freebsd32_proto.h>
 #include <compat/freebsd32/freebsd32_syscall.h>
 #include <compat/ia32/ia32_signal.h>
+#ifdef __amd64__
 #include <machine/psl.h>
 #include <machine/segments.h>
 #include <machine/specialreg.h>
+#else
+#include <i386/include/psl.h>
+#include <i386/include/segments.h>
+#include <i386/include/specialreg.h>
+#endif
 #include <machine/frame.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
@@ -111,7 +117,7 @@ struct sysentvec ia32_freebsd_sysvec = {
 	elf32_coredump,
 	NULL,
 	MINSIGSTKSZ,
-	PAGE_SIZE,
+	IA32_PAGE_SIZE,
 	0,
 	FREEBSD32_USRSTACK,
 	FREEBSD32_USRSTACK,
-- 
cgit v1.1