Move ibcs2_sendsig into compat. Quit poluting machdep.

Ok guenther@

4 files changed, 13 insertions, 19 deletions

diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 3c39b2bb926..d8e31a76965 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.449 2009/05/19 01:31:15 weingart Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.450 2009/06/01 20:11:38 weingart Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -2135,19 +2135,6 @@ pentium_cpuspeed(int *freq)
 }
 #endif	/* !SMALL_KERNEL */
 
-#ifdef COMPAT_IBCS2
-void ibcs2_sendsig(sig_t, int, int, u_long, int, union sigval);
-
-void
-ibcs2_sendsig(sig_t catcher, int sig, int mask, u_long code, int type,
-    union sigval val)
-{
-	extern int bsd_to_ibcs2_sig[];
-
-	sendsig(catcher, bsd_to_ibcs2_sig[sig], mask, code, type, val);
-}
-#endif
-
 /*
  * Send an interrupt to process.
  *
diff --git a/sys/compat/ibcs2/ibcs2_exec.c b/sys/compat/ibcs2/ibcs2_exec.c
index cedbc2bbf73..fd9c94417b8 100644
--- a/sys/compat/ibcs2/ibcs2_exec.c
+++ b/sys/compat/ibcs2/ibcs2_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ibcs2_exec.c,v 1.19 2009/03/05 19:52:23 kettenis Exp $	*/
+/*	$OpenBSD: ibcs2_exec.c,v 1.20 2009/06/01 20:11:38 weingart Exp $	*/
 /*	$NetBSD: ibcs2_exec.c,v 1.12 1996/10/12 02:13:52 thorpej Exp $	*/
 
 /*
@@ -49,6 +49,7 @@
 #include <compat/ibcs2/ibcs2_types.h>
 #include <compat/ibcs2/ibcs2_exec.h>
 #include <compat/ibcs2/ibcs2_util.h>
+#include <compat/ibcs2/ibcs2_signal.h>
 #include <compat/ibcs2/ibcs2_syscall.h>
 
 int exec_ibcs2_coff_prep_omagic(struct proc *, struct exec_package *,
@@ -80,7 +81,6 @@ extern struct sysent ibcs2_sysent[];
 #ifdef SYSCALL_DEBUG
 extern char *ibcs2_syscallnames[];
 #endif
-extern void ibcs2_sendsig(sig_t, int, int, u_long, int, union sigval);
 extern char sigcode[], esigcode[];
 
 const char ibcs2_emul_path[] = "/emul/ibcs2";
diff --git a/sys/compat/ibcs2/ibcs2_signal.c b/sys/compat/ibcs2/ibcs2_signal.c
index d7a4b081880..315f74e82bc 100644
--- a/sys/compat/ibcs2/ibcs2_signal.c
+++ b/sys/compat/ibcs2/ibcs2_signal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ibcs2_signal.c,v 1.8 2008/05/01 11:53:26 miod Exp $	*/
+/*	$OpenBSD: ibcs2_signal.c,v 1.9 2009/06/01 20:11:38 weingart Exp $	*/
 /*	$NetBSD: ibcs2_signal.c,v 1.8 1996/05/03 17:05:27 christos Exp $	*/
 
 /*
@@ -504,3 +504,10 @@ ibcs2_sys_kill(p, v, retval)
 	SCARG(&ka, signum) = ibcs2_to_bsd_sig[SCARG(uap, signo)];
 	return sys_kill(p, &ka, retval);
 }
+
+void
+ibcs2_sendsig(sig_t catcher, int sig, int mask, u_long code, int type,
+	union sigval val)
+{
+	sendsig(catcher, bsd_to_ibcs2_sig[sig], mask, code, type, val);
+}
diff --git a/sys/compat/ibcs2/ibcs2_signal.h b/sys/compat/ibcs2/ibcs2_signal.h
index 7391c546aab..6b417d87990 100644
--- a/sys/compat/ibcs2/ibcs2_signal.h
+++ b/sys/compat/ibcs2/ibcs2_signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ibcs2_signal.h,v 1.5 2002/03/14 01:26:50 millert Exp $	*/
+/*	$OpenBSD: ibcs2_signal.h,v 1.6 2009/06/01 20:11:38 weingart Exp $	*/
 /*	$NetBSD: ibcs2_signal.h,v 1.8 1996/05/03 17:05:28 christos Exp $	*/
 
 /*
@@ -101,6 +101,6 @@ struct ibcs2_sigaction {
 /* sa_flags */
 #define IBCS2_SA_NOCLDSTOP	1
 
-extern int bsd_to_ibcs2_sig[];
+void ibcs2_sendsig(sig_t, int, int, u_long, int, union sigval);
 
 #endif /* _IBCS2_SIGNAL_H */