Date: Wed, 19 Jul 2006 18:41:31 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 101954 for review Message-ID: <200607191841.k6JIfVsI075259@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101954 Change 101954 by jhb@jhb_mutex on 2006/07/19 18:40:50 IFC @101952 - loopback. Affected files ... .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#35 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.c#11 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#34 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#27 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#90 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#112 integrate Differences ... ==== //depot/projects/smpng/sys/compat/linux/linux_socket.c#35 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.69 2006/07/08 20:03:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.70 2006/07/19 18:28:52 jhb Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/svr4/svr4_socket.c#11 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_socket.c,v 1.25 2005/07/07 19:27:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_socket.c,v 1.26 2006/07/19 18:26:09 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -107,19 +107,6 @@ mtx_lock(&Giant); - /* - * Wait for the TAILQ to be initialized. Only the very first CPU - * will succeed on the atomic_cmpset(). The other CPU's will spin - * until the first one finishes the initialization. Once the - * initialization is complete, the condition will always fail - * avoiding expensive atomic operations in the common case. - */ - while (svr4_str_initialized != 2) - if (atomic_cmpset_acq_int(&svr4_str_initialized, 0, 1)) { - TAILQ_INIT(&svr4_head); - atomic_store_rel_int(&svr4_str_initialized, 2); - } - e = malloc(sizeof(*e), M_TEMP, M_WAITOK); e->cookie = NULL; e->dev = st->st_dev; ==== //depot/projects/smpng/sys/ddb/db_command.c#34 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.67 2006/07/12 21:22:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.68 2006/07/19 18:26:53 jhb Exp $"); #include <sys/param.h> #include <sys/linker_set.h> ==== //depot/projects/smpng/sys/dev/streams/streams.c#27 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.51 2006/07/18 22:31:33 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.52 2006/07/19 18:26:09 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/kern/uipc_syscalls.c#90 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.231 2006/07/10 21:38:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.232 2006/07/19 18:28:52 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#112 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.417 2006/07/11 20:52:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.418 2006/07/19 18:30:33 jhb Exp $"); #include "opt_compat.h" #include "opt_mac.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607191841.k6JIfVsI075259>