[src/pgoyette-compat]: src/sys/compat/netbsd32 Use a .h file to define the xx...

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

details:   https://anonhg.NetBSD.org/src/rev/ac7e995b7044
branches:  pgoyette-compat
changeset: 830773:ac7e995b7044
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Sep 23 21:43:45 2018 +0000

description:
Use a .h file to define the xxx_{init,fini} routines, and include
the compat_stub.h header to get the definition of the kern_proc_32
hook.

diffstat:

 sys/compat/netbsd32/netbsd32_kern_proc.c |  10 ++++++----
 sys/compat/netbsd32/netbsd32_mod.c       |  10 +++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diffs (91 lines):

diff -r 5b7e6812fb76 -r ac7e995b7044 sys/compat/netbsd32/netbsd32_kern_proc.c
--- a/sys/compat/netbsd32/netbsd32_kern_proc.c  Sun Sep 23 21:38:08 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_kern_proc.c  Sun Sep 23 21:43:45 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $      */
+/*     $NetBSD: netbsd32_kern_proc.c,v 1.1.2.4 2018/09/23 21:43:45 pgoyette Exp $      */
 
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.4 2018/09/23 21:43:45 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -100,11 +100,13 @@
 #include <sys/sysctl.h>
 #include <sys/exec.h>
 #include <sys/cpu.h>
+#include <sys/compat_stub.h>
 
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm.h>
 
 #include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_kern_proc.h>
 
 static int
 copyin_psstrings_32(struct proc *p, struct ps_strings *arginfo)
@@ -141,7 +143,7 @@
 #endif
 
 void
-kern_proc_32_init(void)
+netbsd32_kern_proc_32_init(void)
 {
 
 #if !defined(_RUMPSERVER)
@@ -150,7 +152,7 @@
 }
 
 void
-kern_proc_32_fini(void)
+netbsd32_kern_proc_32_fini(void)
 {
 
 #if !defined(_RUMPSERVER)
diff -r 5b7e6812fb76 -r ac7e995b7044 sys/compat/netbsd32/netbsd32_mod.c
--- a/sys/compat/netbsd32/netbsd32_mod.c        Sun Sep 23 21:38:08 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_mod.c        Sun Sep 23 21:43:45 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $ */
+/*     $NetBSD: netbsd32_mod.c,v 1.13.16.16 2018/09/23 21:43:45 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.16 2018/09/23 21:43:45 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -112,19 +112,19 @@
                if (error == 0) {
                        netbsd32_sysctl_init();
                        netbsd32_machdep_md_init();
-                       kern_proc_32_init();
+                       netbsd32_kern_proc_32_init();
                }
                return error;
 
        case MODULE_CMD_FINI:
                netbsd32_machdep_md_fini();
                netbsd32_sysctl_fini();
-               kern_proc_32_fini();
+               netbsd32_kern_proc_32_fini();
 
                error = exec_remove(netbsd32_execsw,
                    __arraycount(netbsd32_execsw));
                if (error) {
-                       kern_proc_32_init();
+                       netbsd32_kern_proc_32_init();
                        netbsd32_sysctl_init();
                        netbsd32_machdep_md_init();
                }