From owner-p4-projects@FreeBSD.ORG Wed Jul 19 20:24:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F24016A4FD; Wed, 19 Jul 2006 20:24:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DF9216A4F1 for ; Wed, 19 Jul 2006 20:24:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34F2643E5C for ; Wed, 19 Jul 2006 20:20:42 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6JKKgjv083406 for ; Wed, 19 Jul 2006 20:20:42 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6JKKffs083402 for perforce@freebsd.org; Wed, 19 Jul 2006 20:20:41 GMT (envelope-from jhb@freebsd.org) Date: Wed, 19 Jul 2006 20:20:41 GMT Message-Id: <200607192020.k6JKKffs083402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 101960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jul 2006 20:24:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=101960 Change 101960 by jhb@jhb_mutex on 2006/07/19 20:19:51 IFC @101959 - loopback. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#56 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#14 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#13 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#13 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#13 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#21 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#28 integrate .. //depot/projects/smpng/sys/kern/subr_autoconf.c#10 integrate Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#56 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.86 2006/07/11 20:52:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.88 2006/07/19 19:03:03 jhb Exp $"); #include "opt_mac.h" ==== //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.22 2006/07/11 20:55:22 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.23 2006/07/11 20:52:07 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.23 2006/07/19 19:03:21 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.25 2006/07/19 19:03:03 jhb Exp */ #ifndef _SVR4_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.20 2006/07/11 20:55:22 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.23 2006/07/11 20:52:07 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.21 2006/07/19 19:03:21 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.25 2006/07/19 19:03:03 jhb Exp */ #define SVR4_SYS_exit 1 ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.20 2006/07/11 20:55:22 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.23 2006/07/11 20:52:07 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.21 2006/07/19 19:03:21 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.25 2006/07/19 19:03:03 jhb Exp */ const char *svr4_syscallnames[] = { ==== //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.21 2006/07/11 20:55:22 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.23 2006/07/11 20:52:07 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.22 2006/07/19 19:03:21 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.25 2006/07/19 19:03:03 jhb Exp */ #include @@ -127,7 +127,7 @@ { SYF_MPSAFE | AS(svr4_sys_fstatvfs_args), (sy_call_t *)svr4_sys_fstatvfs, AUE_NULL }, /* 104 = svr4_sys_fstatvfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 105 = whoknows */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 106 = nfssvc */ - { AS(svr4_sys_waitsys_args), (sy_call_t *)svr4_sys_waitsys, AUE_NULL }, /* 107 = svr4_sys_waitsys */ + { SYF_MPSAFE | AS(svr4_sys_waitsys_args), (sy_call_t *)svr4_sys_waitsys, AUE_NULL }, /* 107 = svr4_sys_waitsys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 108 = sigsendsys */ { SYF_MPSAFE | AS(svr4_sys_hrtsys_args), (sy_call_t *)svr4_sys_hrtsys, AUE_NULL }, /* 109 = svr4_sys_hrtsys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = acancel */ @@ -229,7 +229,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 206 = schedctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 207 = pset */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 208 = whoknows */ - { AS(svr4_sys_resolvepath_args), (sy_call_t *)svr4_sys_resolvepath, AUE_NULL }, /* 209 = svr4_sys_resolvepath */ + { SYF_MPSAFE | AS(svr4_sys_resolvepath_args), (sy_call_t *)svr4_sys_resolvepath, AUE_NULL }, /* 209 = svr4_sys_resolvepath */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 210 = signotifywait */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 211 = lwp_sigredirect */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 212 = lwp_alarm */ ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#21 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.23 2006/07/11 20:52:07 jhb Exp $ + $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.25 2006/07/19 19:03:03 jhb Exp $ ; from: @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; ; System call name/number master file (or rather, slave, from SVR4). ==== //depot/projects/smpng/sys/dev/streams/streams.c#28 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.52 2006/07/19 18:26:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.53 2006/07/19 18:52:33 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/kern/subr_autoconf.c#10 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_autoconf.c,v 1.22 2005/01/06 23:35:39 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_autoconf.c,v 1.23 2006/07/19 18:53:56 jhb Exp $"); #include #include