PERFORCE change 100161 for review
John Baldwin
jhb at FreeBSD.org
Tue Jun 27 18:40:13 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=100161
Change 100161 by jhb at jhb_mutex on 2006/06/27 18:39:27
IFC @100159 - loopback.
Affected files ...
.. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#10 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#10 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#10 integrate
.. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#14 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#25 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_util.h#16 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#14 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#12 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#11 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#11 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#11 integrate
.. //depot/projects/smpng/sys/compat/svr4/syscalls.master#15 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_proto.h#28 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#27 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#28 integrate
.. //depot/projects/smpng/sys/i386/linux/syscalls.master#32 integrate
.. //depot/projects/smpng/sys/kern/sysv_sem.c#37 integrate
.. //depot/projects/smpng/sys/sys/syscallsubr.h#30 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#10 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.15 2006/06/27 14:47:07 jhb Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.16 2006/06/27 18:32:16 jhb Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp
*/
#ifndef _LINUX_SYSPROTO_H_
==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#10 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.15 2006/06/27 14:47:07 jhb Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.16 2006/06/27 18:32:16 jhb Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp
*/
#define LINUX_SYS_exit 1
==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#10 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.15 2006/06/27 14:47:07 jhb Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.16 2006/06/27 18:32:16 jhb Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp
*/
#include <bsm/audit_kevents.h>
@@ -137,7 +137,7 @@
{ SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */
{ SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */
{ SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */
- { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */
+ { SYF_MPSAFE | AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */
{ SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */
{ SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */
{ SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */
==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#14 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.13 2006/06/27 14:46:30 jhb Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
==== //depot/projects/smpng/sys/compat/linux/linux_ipc.c#25 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.46 2006/03/19 11:10:33 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.47 2006/06/27 18:28:49 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/smpng/sys/compat/linux/linux_util.h#16 (text+ko) ====
@@ -28,7 +28,7 @@
*
* from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
* from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
- * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.27 2006/05/05 16:10:45 ambrisko Exp $
+ * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.28 2006/06/27 18:30:49 jhb Exp $
*/
/*
==== //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#14 (text+ko) ====
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ipc.c,v 1.19 2005/09/28 07:03:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ipc.c,v 1.21 2006/06/27 18:31:36 jhb Exp $");
#include "opt_sysvipc.h"
==== //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#12 (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.20 2006/06/26 18:37:36 jhb Exp $
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp
+ * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.21 2006/06/27 18:32:16 jhb Exp $
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.22 2006/06/27 18:31:36 jhb Exp
*/
#ifndef _SVR4_SYSPROTO_H_
==== //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#11 (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.18 2006/06/26 18:37:36 jhb Exp $
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp
+ * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.19 2006/06/27 18:32:16 jhb Exp $
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.22 2006/06/27 18:31:36 jhb Exp
*/
#define SVR4_SYS_exit 1
==== //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#11 (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.18 2006/06/26 18:37:36 jhb Exp $
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp
+ * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.19 2006/06/27 18:32:16 jhb Exp $
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.22 2006/06/27 18:31:36 jhb Exp
*/
const char *svr4_syscallnames[] = {
==== //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#11 (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.19 2006/06/26 18:37:36 jhb Exp $
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp
+ * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.20 2006/06/27 18:32:16 jhb Exp $
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.22 2006/06/27 18:31:36 jhb Exp
*/
#include <bsm/audit_kevents.h>
@@ -72,8 +72,8 @@
{ SYF_MPSAFE | AS(svr4_sys_msgsys_args), (sy_call_t *)svr4_sys_msgsys, AUE_NULL }, /* 49 = svr4_sys_msgsys */
{ SYF_MPSAFE | AS(svr4_sys_sysarch_args), (sy_call_t *)svr4_sys_sysarch, AUE_NULL }, /* 50 = svr4_sys_sysarch */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 51 = acct */
- { AS(svr4_sys_shmsys_args), (sy_call_t *)svr4_sys_shmsys, AUE_NULL }, /* 52 = svr4_sys_shmsys */
- { AS(svr4_sys_semsys_args), (sy_call_t *)svr4_sys_semsys, AUE_NULL }, /* 53 = svr4_sys_semsys */
+ { 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 */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = uadmin */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = exch */
==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#15 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp $
+ $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.22 2006/06/27 18:31:36 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/i386/linux/linux_proto.h#28 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.73 2006/06/27 14:47:08 jhb Exp $
- * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.70 2006/06/27 14:46:30 jhb Exp
+ * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.74 2006/06/27 18:32:16 jhb Exp $
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.71 2006/06/27 18:28:50 jhb Exp
*/
#ifndef _LINUX_SYSPROTO_H_
==== //depot/projects/smpng/sys/i386/linux/linux_syscall.h#27 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.67 2006/06/27 14:47:08 jhb Exp $
- * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.70 2006/06/27 14:46:30 jhb Exp
+ * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.68 2006/06/27 18:32:16 jhb Exp $
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.71 2006/06/27 18:28:50 jhb Exp
*/
#define LINUX_SYS_exit 1
==== //depot/projects/smpng/sys/i386/linux/linux_sysent.c#28 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.74 2006/06/27 14:47:08 jhb Exp $
- * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.70 2006/06/27 14:46:30 jhb Exp
+ * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.75 2006/06/27 18:32:16 jhb Exp $
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.71 2006/06/27 18:28:50 jhb Exp
*/
#include <bsm/audit_kevents.h>
@@ -136,7 +136,7 @@
{ SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */
{ SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */
{ SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */
- { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */
+ { SYF_MPSAFE | AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */
{ SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */
{ SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */
{ SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */
==== //depot/projects/smpng/sys/i386/linux/syscalls.master#32 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.70 2006/06/27 14:46:30 jhb Exp $
+ $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.71 2006/06/27 18:28:50 jhb Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
==== //depot/projects/smpng/sys/kern/sysv_sem.c#37 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.79 2006/06/10 14:34:07 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.80 2006/06/27 18:28:50 jhb Exp $");
#include "opt_sysvipc.h"
#include "opt_mac.h"
==== //depot/projects/smpng/sys/sys/syscallsubr.h#30 (text+ko) ====
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.37 2006/06/13 21:28:18 jhb Exp $
+ * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.38 2006/06/27 18:28:50 jhb Exp $
*/
#ifndef _SYS_SYSCALLSUBR_H_
More information about the p4-projects
mailing list