From 83c2f7aaf585febc300d5d08d8ea6cd1a5143a13 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sun, 31 Mar 2002 22:21:02 +0000
Subject: [PATCH] compat signal array renaming.

---
 sys/arch/i386/i386/ibcs2_machdep.c      | 6 +++---
 sys/arch/i386/i386/svr4_machdep.c       | 6 +++---
 sys/arch/m68k/m68k/svr4_machdep.c       | 4 ++--
 sys/arch/sparc/sparc/svr4_machdep.c     | 4 ++--
 sys/arch/sparc64/sparc64/svr4_machdep.c | 4 ++--
 sys/arch/vax/vax/ibcs2_machdep.c        | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sys/arch/i386/i386/ibcs2_machdep.c b/sys/arch/i386/i386/ibcs2_machdep.c
index a9cc5affe590..1da38fa04169 100644
--- a/sys/arch/i386/i386/ibcs2_machdep.c
+++ b/sys/arch/i386/i386/ibcs2_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibcs2_machdep.c,v 1.17 2001/11/15 07:03:29 lukem Exp $	*/
+/*	$NetBSD: ibcs2_machdep.c,v 1.18 2002/03/31 22:21:02 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_machdep.c,v 1.17 2001/11/15 07:03:29 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_machdep.c,v 1.18 2002/03/31 22:21:02 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
@@ -125,7 +125,7 @@ ibcs2_sendsig(catcher, sig, mask, code)
 	fp--;
 
 	/* Build stack frame for signal trampoline. */
-	frame.sf_signum = native_to_ibcs2_sig[sig];
+	frame.sf_signum = native_to_ibcs2_signo[sig];
 	frame.sf_code = code;
 	frame.sf_scp = &fp->sf_sc;
 	frame.sf_handler = catcher;
diff --git a/sys/arch/i386/i386/svr4_machdep.c b/sys/arch/i386/i386/svr4_machdep.c
index 89294a2d266a..927fc643514c 100644
--- a/sys/arch/i386/i386/svr4_machdep.c
+++ b/sys/arch/i386/i386/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.60 2002/03/16 20:45:43 christos Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.61 2002/03/31 22:21:02 christos Exp $	 */
 
 /*-
  * Copyright (c) 1994, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.60 2002/03/16 20:45:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.61 2002/03/31 22:21:02 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
@@ -268,7 +268,7 @@ svr4_getsiginfo(si, sig, code, addr)
 	u_long			 code;
 	caddr_t			 addr;
 {
-	si->si_signo = native_to_svr4_sig[sig];
+	si->si_signo = native_to_svr4_signo[sig];
 	si->si_errno = 0;
 	si->si_addr  = addr;
 
diff --git a/sys/arch/m68k/m68k/svr4_machdep.c b/sys/arch/m68k/m68k/svr4_machdep.c
index 855ebc1c3ec6..2e1d36cc5abc 100644
--- a/sys/arch/m68k/m68k/svr4_machdep.c
+++ b/sys/arch/m68k/m68k/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.6 2001/02/04 23:53:32 jmc Exp $	*/
+/*	$NetBSD: svr4_machdep.c,v 1.7 2002/03/31 22:21:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -237,7 +237,7 @@ svr4_getsiginfo(sip, sig, code, addr)
 	 * at a place near you.
 	 */
 
-	sip->si_signo = native_to_svr4_sig[sig];
+	sip->si_signo = native_to_svr4_signo[sig];
 	sip->si_errno = 0;
 	sip->si_code  = 0;	/* reserved, `no information' */
 	sip->si_addr  = addr;	/* XXX not necessarily correct */
diff --git a/sys/arch/sparc/sparc/svr4_machdep.c b/sys/arch/sparc/sparc/svr4_machdep.c
index 8d57c12de5d3..d49c59b5312a 100644
--- a/sys/arch/sparc/sparc/svr4_machdep.c
+++ b/sys/arch/sparc/sparc/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.43 2001/05/30 12:28:51 mrg Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.44 2002/03/31 22:21:03 christos Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -322,7 +322,7 @@ svr4_getsiginfo(si, sig, code, addr)
 	u_long			 code;
 	caddr_t			 addr;
 {
-	si->si_signo = native_to_svr4_sig[sig];
+	si->si_signo = native_to_svr4_signo[sig];
 	si->si_errno = 0;
 	si->si_addr  = addr;
 	/*
diff --git a/sys/arch/sparc64/sparc64/svr4_machdep.c b/sys/arch/sparc64/sparc64/svr4_machdep.c
index f603c13b213d..ead6fc334843 100644
--- a/sys/arch/sparc64/sparc64/svr4_machdep.c
+++ b/sys/arch/sparc64/sparc64/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.24 2002/03/21 22:50:09 petrov Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.25 2002/03/31 22:21:04 christos Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -363,7 +363,7 @@ svr4_getsiginfo(si, sig, code, addr)
 	u_long			 code;
 	caddr_t			 addr;
 {
-	si->si_signo = native_to_svr4_sig[sig];
+	si->si_signo = native_to_svr4_signo[sig];
 	si->si_errno = 0;
 	si->si_addr  = addr;
 	/*
diff --git a/sys/arch/vax/vax/ibcs2_machdep.c b/sys/arch/vax/vax/ibcs2_machdep.c
index 4ba2eb7b8653..18716eb3ceaa 100644
--- a/sys/arch/vax/vax/ibcs2_machdep.c
+++ b/sys/arch/vax/vax/ibcs2_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibcs2_machdep.c,v 1.1 2000/01/10 03:06:44 matt Exp $	*/
+/*	$NetBSD: ibcs2_machdep.c,v 1.2 2002/03/31 22:21:04 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@ ibcs2_sendsig(catcher, sig, mask, code)
 	sigset_t *mask;
 	u_long code;
 {
-	sendsig(catcher, native_to_ibcs2_sig[sig], mask, code);
+	sendsig(catcher, native_to_ibcs2_signo[sig], mask, code);
 }
 
 int