svn commit: r184907 - in stable/7/sys: . compat/freebsd32 modules/cxgb

[Peter Wemm]

Author: peter
Date: Thu Nov 13 02:35:29 2008
New Revision: 184907
URL: http://svn.freebsd.org/changeset/base/184907

Log:
  MFC 184828,184829: Fix si_addr in 32 bit signals.
  
  Approved by:	re (kib)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/freebsd32/freebsd32_misc.c
  stable/7/sys/modules/cxgb/   (props changed)

Modified: stable/7/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- stable/7/sys/compat/freebsd32/freebsd32_misc.c	Thu Nov 13 02:22:29 2008	(r184906)
+++ stable/7/sys/compat/freebsd32/freebsd32_misc.c	Thu Nov 13 02:35:29 2008	(r184907)
@@ -2389,7 +2389,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 = (uintptr_t)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;