From owner-p4-projects@FreeBSD.ORG Fri Jul 28 17:10:17 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 0424D16A4DD; Fri, 28 Jul 2006 17:10:17 +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 BB5D016A4ED for ; Fri, 28 Jul 2006 17:10:16 +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 371FF43D46 for ; Fri, 28 Jul 2006 17:10:16 +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 k6SHAGY1064904 for ; Fri, 28 Jul 2006 17:10:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SHAFoR064901 for perforce@freebsd.org; Fri, 28 Jul 2006 17:10:15 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 17:10:15 GMT Message-Id: <200607281710.k6SHAFoR064901@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 102665 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: Fri, 28 Jul 2006 17:10:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=102665 Change 102665 by jhb@jhb_mutex on 2006/07/28 17:09:59 IFC @102663 - loopback. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#16 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#41 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stropts.h#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#15 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#15 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#15 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#24 integrate Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#16 (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.24 2006/07/21 20:41:33 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.26 2006/07/21 20:28:56 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.25 2006/07/28 16:56:44 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.27 2006/07/28 16:56:17 jhb Exp */ #ifndef _SVR4_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#41 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.60 2006/07/27 19:54:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.61 2006/07/28 16:56:17 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/compat/svr4/svr4_stropts.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_stropts.h,v 1.5 2005/01/05 22:34:37 imp Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_stropts.h,v 1.6 2006/07/28 16:56:17 jhb Exp $ */ #ifndef _SVR4_STROPTS_H_ ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#15 (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.22 2006/07/21 20:41:33 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.26 2006/07/21 20:28:56 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.23 2006/07/28 16:56:44 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.27 2006/07/28 16:56:17 jhb Exp */ #define SVR4_SYS_exit 1 ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#15 (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.22 2006/07/21 20:41:33 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.26 2006/07/21 20:28:56 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.23 2006/07/28 16:56:44 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.27 2006/07/28 16:56:17 jhb Exp */ const char *svr4_syscallnames[] = { ==== //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#15 (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.23 2006/07/21 20:41:33 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.26 2006/07/21 20:28:56 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.24 2006/07/28 16:56:44 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.27 2006/07/28 16:56:17 jhb Exp */ #include @@ -74,7 +74,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 51 = acct */ { SYF_MPSAFE | AS(svr4_sys_shmsys_args), (sy_call_t *)svr4_sys_shmsys, AUE_NULL }, /* 52 = svr4_sys_shmsys */ { SYF_MPSAFE | AS(svr4_sys_semsys_args), (sy_call_t *)svr4_sys_semsys, AUE_NULL }, /* 53 = svr4_sys_semsys */ - { AS(svr4_sys_ioctl_args), (sy_call_t *)svr4_sys_ioctl, AUE_NULL }, /* 54 = svr4_sys_ioctl */ + { SYF_MPSAFE | AS(svr4_sys_ioctl_args), (sy_call_t *)svr4_sys_ioctl, AUE_NULL }, /* 54 = svr4_sys_ioctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = uadmin */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = exch */ { SYF_MPSAFE | AS(svr4_sys_utssys_args), (sy_call_t *)svr4_sys_utssys, AUE_NULL }, /* 57 = svr4_sys_utssys */ @@ -105,8 +105,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 82 = libattach */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 83 = libdetach */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = sysfs */ - { AS(svr4_sys_getmsg_args), (sy_call_t *)svr4_sys_getmsg, AUE_NULL }, /* 85 = svr4_sys_getmsg */ - { AS(svr4_sys_putmsg_args), (sy_call_t *)svr4_sys_putmsg, AUE_NULL }, /* 86 = svr4_sys_putmsg */ + { SYF_MPSAFE | AS(svr4_sys_getmsg_args), (sy_call_t *)svr4_sys_getmsg, AUE_NULL }, /* 85 = svr4_sys_getmsg */ + { SYF_MPSAFE | AS(svr4_sys_putmsg_args), (sy_call_t *)svr4_sys_putmsg, AUE_NULL }, /* 86 = svr4_sys_putmsg */ { SYF_MPSAFE | AS(svr4_sys_poll_args), (sy_call_t *)svr4_sys_poll, AUE_NULL }, /* 87 = svr4_sys_poll */ { SYF_MPSAFE | AS(svr4_sys_lstat_args), (sy_call_t *)svr4_sys_lstat, AUE_NULL }, /* 88 = svr4_sys_lstat */ { SYF_MPSAFE | AS(symlink_args), (sy_call_t *)symlink, AUE_NULL }, /* 89 = symlink */ ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#24 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.26 2006/07/21 20:28:56 jhb Exp $ + $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.27 2006/07/28 16:56:17 jhb Exp $ ; from: @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; ; System call name/number master file (or rather, slave, from SVR4).