From 06fdae3c36a60468b57db4beba303299d17c969a Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Mon, 3 Feb 1997 12:48:35 +0000
Subject: [PATCH] repair confusion over kv/uv addr for siginfo_t storage

---
 sys/arch/amiga/amiga/machdep.c     | 6 +++---
 sys/arch/hp300/hp300/machdep.c     | 6 +++---
 sys/arch/i386/i386/machdep.c       | 4 ++--
 sys/arch/mvme68k/mvme68k/machdep.c | 6 +++---
 sys/arch/sparc/sparc/machdep.c     | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 0b51f1b67c1..223ce297bba 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.19 1997/02/03 11:38:08 deraadt Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.20 1997/02/03 12:48:35 deraadt Exp $	*/
 /*	$NetBSD: machdep.c,v 1.82 1996/12/17 07:32:54 is Exp $	*/
 
 /*
@@ -877,8 +877,8 @@ printf("sendsig %d %d %x %x %x\n", p->p_pid, sig, mask, code, catcher);
 	kfp->sf_sc.sc_ps = frame->f_sr;
 
 	if (psp->ps_siginfo & sigmask(sig)) {
-		kfp->sf_sip = &kfp->sf_si;
-		initsiginfo(kfp->sf_sip, sig, code, type, val);
+		kfp->sf_sip = &fp->sf_si;
+		initsiginfo(&kfp->sf_si, sig, code, type, val);
 	}
 
 	(void) copyout((caddr_t)kfp, (caddr_t)fp, sizeof(struct sigframe));
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index 1276fa31b8e..8a11216119d 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.12 1997/02/03 04:47:58 downsj Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.13 1997/02/03 12:48:46 deraadt Exp $	*/
 /*	$NetBSD: machdep.c,v 1.77 1996/12/11 16:49:23 thorpej Exp $	*/
 
 /*
@@ -913,8 +913,8 @@ sendsig(catcher, sig, mask, code, type, val)
 	kfp->sf_sc.sc_ps = frame->f_sr;
 
 	if (psp->ps_siginfo & sigmask(sig)) {
-		kfp->sf_sip = &kfp->sf_si;
-		initsiginfo(kfp->sf_sip, sig, code, type, val);
+		kfp->sf_sip = &fp->sf_si;
+		initsiginfo(&kfp->sf_si, sig, code, type, val);
 	}
 
 #ifdef COMPAT_HPUX
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index aff31758dff..b90136c2ceb 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.39 1997/02/01 21:53:23 deraadt Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.40 1997/02/03 12:48:58 deraadt Exp $	*/
 /*	$NetBSD: machdep.c,v 1.202 1996/05/18 15:54:59 christos Exp $	*/
 
 /*-
@@ -673,7 +673,7 @@ sendsig(catcher, sig, mask, code, type, val)
 
 	if (psp->ps_siginfo & sigmask(sig)) {
 		frame.sf_sip = &fp->sf_si;
-		initsiginfo(frame.sf_sip, sig, code, type, val);
+		initsiginfo(&frame.sf_si, sig, code, type, val);
 	}
 
 	/* XXX don't copyout siginfo if not needed? */
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 9d0f21406f0..73723971129 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.16 1997/02/02 00:43:20 deraadt Exp $ */
+/*	$OpenBSD: machdep.c,v 1.17 1997/02/03 12:48:52 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -815,8 +815,8 @@ sendsig(catcher, sig, mask, code, type, val)
 	kfp->sf_sc.sc_ps = frame->f_sr;
 
 	if (psp->ps_siginfo & sigmask(sig)) {
-		kfp->sf_sip = &kfp->sf_si;
-		initsiginfo(kfp->sf_sip, sig, code, type, val);
+		kfp->sf_sip = &fp->sf_si;
+		initsiginfo(&kfp->sf_si, sig, code, type, val);
 	}
 
 #ifdef COMPAT_HPUX
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 0e4ba58c863..9aa15c27dec 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -532,7 +532,7 @@ sendsig(catcher, sig, mask, code, type, val)
 
 	if (psp->ps_siginfo & sigmask(sig)) {
 		sf.sf_u.sfu_sip = &fp->sf_si;
-		initsiginfo(sf.sf_u.sfu_sip, sig, code, type, val);
+		initsiginfo(&sf.sf_si, sig, code, type, val);
 	}
 
 	/*
-- 
2.20.1