Date: Tue, 15 Aug 2006 18:45:01 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 104095 for review Message-ID: <200608151845.k7FIj1ai045820@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=104095 Change 104095 by jhb@jhb_mutex on 2006/08/15 18:44:37 IFC @104093 - loopback. Affected files ... .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#10 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#136 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#38 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#34 integrate .. //depot/projects/smpng/sys/sys/lockmgr.h#17 integrate .. //depot/projects/smpng/sys/sys/sx.h#21 integrate Differences ... ==== //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.11 2006/06/23 22:45:35 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.12 2006/08/15 18:11:25 imp Exp $"); #include <machine/asm.h> #include <sys/types.h> #include <sys/elf32.h> @@ -36,6 +36,10 @@ #include <stdlib.h> +/* + * Since we are compiled outside of the normal kernel build process, we + * need to include opt_global.h manually. + */ #include "opt_global.h" #include "opt_kernname.h" ==== //depot/projects/smpng/sys/kern/kern_lock.c#54 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.98 2006/08/15 16:42:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.99 2006/08/15 18:29:01 jhb Exp $"); #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/kern_mutex.c#136 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.175 2006/07/27 21:45:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.176 2006/08/15 18:26:12 jhb Exp $"); #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/kern_sx.c#38 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.29 2006/07/27 21:45:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.30 2006/08/15 18:29:01 jhb Exp $"); #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/subr_turnstile.c#34 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.162 2006/08/15 16:44:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.163 2006/08/15 18:29:01 jhb Exp $"); #include "opt_ddb.h" #include "opt_turnstile_profiling.h" ==== //depot/projects/smpng/sys/sys/lockmgr.h#17 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lock.h 8.12 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/lockmgr.h,v 1.49 2005/08/03 04:59:07 jeff Exp $ + * $FreeBSD: src/sys/sys/lockmgr.h,v 1.50 2006/08/15 18:29:01 jhb Exp $ */ #ifndef _SYS_LOCKMGR_H_ ==== //depot/projects/smpng/sys/sys/sx.h#21 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/sys/sx.h,v 1.24 2006/06/21 20:38:29 jhb Exp $ + * $FreeBSD: src/sys/sys/sx.h,v 1.25 2006/08/15 18:29:01 jhb Exp $ */ #ifndef _SYS_SX_H_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608151845.k7FIj1ai045820>