[src/trunk]: src/sys/arch/i386/i386 compat code reorg. Other archs will need ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eb17745eab8b
branches:  trunk
changeset: 584312:eb17745eab8b
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Sep 13 01:43:29 2005 +0000

description:
compat code reorg. Other archs will need similar changes...

diffstat:

 sys/arch/i386/i386/compat_13_machdep.c |  7 +++++--
 sys/arch/i386/i386/compat_16_machdep.c |  7 +++++--
 sys/arch/i386/i386/darwin_machdep.c    |  6 ++++--
 sys/arch/i386/i386/freebsd_machdep.c   |  7 +++++--
 sys/arch/i386/i386/freebsd_syscall.c   |  6 ++++--
 sys/arch/i386/i386/genassym.cf         |  5 ++++-
 6 files changed, 27 insertions(+), 11 deletions(-)

diffs (171 lines):

diff -r 5c57669f3781 -r eb17745eab8b sys/arch/i386/i386/compat_13_machdep.c
--- a/sys/arch/i386/i386/compat_13_machdep.c    Tue Sep 13 01:42:32 2005 +0000
+++ b/sys/arch/i386/i386/compat_13_machdep.c    Tue Sep 13 01:43:29 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_13_machdep.c,v 1.13 2003/10/27 14:11:46 junyoung Exp $  */
+/*     $NetBSD: compat_13_machdep.c,v 1.14 2005/09/13 01:43:29 christos Exp $  */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.13 2003/10/27 14:11:46 junyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.14 2005/09/13 01:43:29 christos Exp $");
 
 #include "opt_vm86.h"
 
@@ -51,6 +51,9 @@
 #include <sys/sa.h>
 #include <sys/syscallargs.h>
 
+#include <compat/sys/signal.h>
+#include <compat/sys/signalvar.h>
+
 #ifdef VM86
 #include <machine/vm86.h>
 #endif
diff -r 5c57669f3781 -r eb17745eab8b sys/arch/i386/i386/compat_16_machdep.c
--- a/sys/arch/i386/i386/compat_16_machdep.c    Tue Sep 13 01:42:32 2005 +0000
+++ b/sys/arch/i386/i386/compat_16_machdep.c    Tue Sep 13 01:43:29 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_16_machdep.c,v 1.6 2003/10/27 14:11:46 junyoung Exp $   */
+/*     $NetBSD: compat_16_machdep.c,v 1.7 2005/09/13 01:43:29 christos Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.6 2003/10/27 14:11:46 junyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.7 2005/09/13 01:43:29 christos Exp $");
 
 #include "opt_vm86.h"
 #include "opt_compat_netbsd.h"
@@ -65,6 +65,9 @@
 #include <machine/vmparam.h>
 
 #if defined(COMPAT_16) || defined(COMPAT_IBCS2)
+
+#include <compat/sys/signal.h>
+#include <compat/sys/signalvar.h>
 /*
  * System call to cleanup state after a signal
  * has been taken.  Reset signal mask and
diff -r 5c57669f3781 -r eb17745eab8b sys/arch/i386/i386/darwin_machdep.c
--- a/sys/arch/i386/i386/darwin_machdep.c       Tue Sep 13 01:42:32 2005 +0000
+++ b/sys/arch/i386/i386/darwin_machdep.c       Tue Sep 13 01:43:29 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: darwin_machdep.c,v 1.7 2004/07/28 22:24:06 manu Exp $ */
+/*     $NetBSD: darwin_machdep.c,v 1.8 2005/09/13 01:43:29 christos Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_machdep.c,v 1.7 2004/07/28 22:24:06 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_machdep.c,v 1.8 2005/09/13 01:43:29 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -45,6 +45,8 @@
 #include <sys/signal.h>
 #include <sys/mount.h>
 
+#include <compat/sys/signal.h>
+
 #include <compat/mach/mach_types.h>
 #include <compat/mach/mach_vm.h>
 
diff -r 5c57669f3781 -r eb17745eab8b sys/arch/i386/i386/freebsd_machdep.c
--- a/sys/arch/i386/i386/freebsd_machdep.c      Tue Sep 13 01:42:32 2005 +0000
+++ b/sys/arch/i386/i386/freebsd_machdep.c      Tue Sep 13 01:43:29 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: freebsd_machdep.c,v 1.42 2003/10/27 14:11:46 junyoung Exp $    */
+/*     $NetBSD: freebsd_machdep.c,v 1.43 2005/09/13 01:43:29 christos Exp $    */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_machdep.c,v 1.42 2003/10/27 14:11:46 junyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_machdep.c,v 1.43 2005/09/13 01:43:29 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
@@ -51,6 +51,8 @@
 #include <sys/user.h>
 #include <sys/mount.h>
 
+#include <compat/sys/signal.h>
+
 #include <machine/cpufunc.h>
 #include <machine/npx.h>
 #include <machine/reg.h>
@@ -58,6 +60,7 @@
 #include <machine/vmparam.h>
 #include <machine/freebsd_machdep.h>
 
+
 #include <compat/freebsd/freebsd_syscallargs.h>
 #include <compat/freebsd/freebsd_exec.h>
 #include <compat/freebsd/freebsd_signal.h>
diff -r 5c57669f3781 -r eb17745eab8b sys/arch/i386/i386/freebsd_syscall.c
--- a/sys/arch/i386/i386/freebsd_syscall.c      Tue Sep 13 01:42:32 2005 +0000
+++ b/sys/arch/i386/i386/freebsd_syscall.c      Tue Sep 13 01:43:29 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: freebsd_syscall.c,v 1.17 2005/07/01 18:01:44 christos Exp $    */
+/*     $NetBSD: freebsd_syscall.c,v 1.18 2005/09/13 01:43:29 christos Exp $    */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.17 2005/07/01 18:01:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.18 2005/09/13 01:43:29 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_syscall_debug.h"
@@ -65,6 +65,8 @@
 #include <machine/psl.h>
 #include <machine/userret.h>
 
+#include <compat/sys/signal.h>
+
 #include <machine/freebsd_machdep.h>
 #include <compat/freebsd/freebsd_syscall.h>
 
diff -r 5c57669f3781 -r eb17745eab8b sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf    Tue Sep 13 01:42:32 2005 +0000
+++ b/sys/arch/i386/i386/genassym.cf    Tue Sep 13 01:43:29 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.40 2004/02/20 17:35:01 yamt Exp $
+#      $NetBSD: genassym.cf,v 1.41 2005/09/13 01:43:29 christos Exp $
 
 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,6 +78,7 @@
 include "opt_compat_svr4.h"
 include "opt_compat_freebsd.h"
 include "opt_compat_linux.h"
+include "opt_compat_netbsd.h"
 include "opt_multiprocessor.h"
 endif
 
@@ -110,6 +111,8 @@
 include <machine/apmvar.h>
 endif
 
+include <compat/sys/signal.h>
+
 ifdef COMPAT_SVR4
 include <compat/svr4/svr4_ucontext.h>
 endif