From owner-svn-src-head@FreeBSD.ORG  Mon Nov 10 23:26:52 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6DBD71065670;
	Mon, 10 Nov 2008 23:26:52 +0000 (UTC)
	(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E6C58FC14;
	Mon, 10 Nov 2008 23:26:52 +0000 (UTC)
	(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAANQqan085164;
	Mon, 10 Nov 2008 23:26:52 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAANQqEJ085163;
	Mon, 10 Nov 2008 23:26:52 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <200811102326.mAANQqEJ085163@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 10 Nov 2008 23:26:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184828 - head/sys/compat/freebsd32
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Nov 2008 23:26:52 -0000

Author: peter
Date: Mon Nov 10 23:26:52 2008
New Revision: 184828
URL: http://svn.freebsd.org/changeset/base/184828

Log:
  Fix a signal emulation bug introduced in r163018 (and present in 7.x).
  This prevents 32 bit signal handlers from finding out what the faulting
  address is.  Both the secret 4th argument and siginfo->si_addr are zero.

Modified:
  head/sys/compat/freebsd32/freebsd32_misc.c

Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_misc.c	Mon Nov 10 23:18:10 2008	(r184827)
+++ head/sys/compat/freebsd32/freebsd32_misc.c	Mon Nov 10 23:26:52 2008	(r184828)
@@ -2442,7 +2442,7 @@ siginfo_to_siginfo32(siginfo_t *src, str
 	dst->si_pid = src->si_pid;
 	dst->si_uid = src->si_uid;
 	dst->si_status = src->si_status;
-	dst->si_addr = dst->si_addr;
+	dst->si_addr = src->si_addr;
 	dst->si_value.sigval_int = src->si_value.sival_int;
 	dst->si_timerid = src->si_timerid;
 	dst->si_overrun = src->si_overrun;