PERFORCE change 142026 for review
John Birrell
jb at FreeBSD.org
Thu May 22 07:57:25 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142026
Change 142026 by jb at freebsd3 on 2008/05/22 07:56:55
IFC
Affected files ...
.. //depot/projects/dtrace/src/cddl/lib/Makefile#13 integrate
.. //depot/projects/dtrace/src/cddl/lib/drti/Makefile#3 integrate
.. //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#8 integrate
.. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#24 integrate
.. //depot/projects/dtrace/src/cddl/lib/libdtrace/errno.d#3 integrate
.. //depot/projects/dtrace/src/cddl/lib/libdtrace/net.d#2 integrate
.. //depot/projects/dtrace/src/cddl/lib/libdtrace/nfs.d#2 integrate
.. //depot/projects/dtrace/src/cddl/lib/libdtrace/psinfo.d#5 integrate
.. //depot/projects/dtrace/src/cddl/lib/libdtrace/sched.d#2 integrate
.. //depot/projects/dtrace/src/cddl/lib/libdtrace/signal.d#3 integrate
.. //depot/projects/dtrace/src/cddl/lib/libdtrace/unistd.d#2 integrate
.. //depot/projects/dtrace/src/lib/Makefile#21 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_mod.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_subr.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/lockstat.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cmn_err.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#2 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#29 integrate
Differences ...
==== //depot/projects/dtrace/src/cddl/lib/Makefile#13 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.9 2008/05/22 04:26:42 jb Exp $
.include <bsd.own.mk>
==== //depot/projects/dtrace/src/cddl/lib/drti/Makefile#3 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#8 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#24 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/lib/libdtrace/errno.d#3 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/lib/libdtrace/net.d#2 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/lib/libdtrace/nfs.d#2 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/lib/libdtrace/psinfo.d#5 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/lib/libdtrace/sched.d#2 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/lib/libdtrace/signal.d#3 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/lib/libdtrace/unistd.d#2 (text+ko) ====
==== //depot/projects/dtrace/src/lib/Makefile#21 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $
+# $FreeBSD: src/lib/Makefile,v 1.230 2008/05/22 04:22:43 jb Exp $
.include <bsd.own.mk>
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_mod.c#2 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_subr.c#2 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#3 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/lockstat.c#2 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#2 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#2 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#2 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cmn_err.h#2 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#2 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#3 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h#3 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#3 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#3 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#3 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#2 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#2 (text) ====
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#2 (text) ====
==== //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#18 (text+ko) ====
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.201 2008/05/18 04:16:56 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.202 2008/05/22 06:27:46 marcel Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -439,7 +439,7 @@
pte[i].chain = (uintptr_t)(pmap_vhpt_bucket + i);
/* Stolen memory is zeroed! */
mtx_init(&pmap_vhpt_bucket[i].mutex, "VHPT bucket lock", NULL,
- MTX_SPIN);
+ MTX_NOWITNESS | MTX_SPIN);
}
for (i = 1; i < MAXCPU; i++) {
==== //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#29 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.271 2008/04/27 15:50:00 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.272 2008/05/22 07:18:54 rwatson Exp $");
#include "opt_sctp.h"
#include "opt_compat.h"
@@ -750,7 +750,11 @@
#ifdef MAC
SOCK_LOCK(so);
- error = mac_socket_check_send(td->td_ucred, so);
+ if (mp->msg_name != NULL)
+ error = mac_socket_check_connect(td->td_ucred, so,
+ mp->msg_name);
+ if (error == 0)
+ error = mac_socket_check_send(td->td_ucred, so);
SOCK_UNLOCK(so);
if (error)
goto bad;
More information about the p4-projects
mailing list