PERFORCE change 16316 for review

[Robert Watson]

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16316

Change 16316 by rwatson at rwatson_paprika on 2002/08/19 18:11:54

	Regen.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#28 edit
.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#28 edit
.. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#28 edit
.. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#28 edit
.. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#29 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#28 (text+ko) ====

@@ -2,16 +2,8 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
->>>> ORIGINAL init_sysent.c#14
- * $FreeBSD: src/sys/kern/init_sysent.c,v 1.130 2002/08/06 15:16:55 rwatson Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp 
-==== THEIRS init_sysent.c#15
- * $FreeBSD: src/sys/kern/init_sysent.c,v 1.131 2002/08/19 20:02:29 rwatson Exp $
+ * $FreeBSD$
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp 
-==== YOURS init_sysent.c
- * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp 
-<<<<
  */
 
 #include "opt_compat.h"
@@ -430,12 +422,6 @@
 	{ AS(lchflags_args), (sy_call_t *)lchflags },	/* 391 = lchflags */
 	{ AS(uuidgen_args), (sy_call_t *)uuidgen },	/* 392 = uuidgen */
 	{ SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile },	/* 393 = sendfile */
->>>> ORIGINAL init_sysent.c#14
-	{ SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)nosys },	/* 394 = mac_syscall */
-==== THEIRS init_sysent.c#15
-	{ SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall },	/* 394 = mac_syscall */
-==== YOURS init_sysent.c
 	{ SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall },	/* 394 = mac_syscall */
 	{ SYF_MPSAFE | AS(mac_get_pid_args), (sy_call_t *)mac_get_pid },	/* 395 = mac_get_pid */
-<<<<
 };

==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#28 (text+ko) ====

@@ -2,16 +2,8 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
->>>> ORIGINAL syscalls.c#14
- * $FreeBSD: src/sys/kern/syscalls.c,v 1.116 2002/08/06 15:16:55 rwatson Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp 
-==== THEIRS syscalls.c#15
- * $FreeBSD: src/sys/kern/syscalls.c,v 1.117 2002/08/19 20:02:29 rwatson Exp $
+ * $FreeBSD$
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp 
-==== YOURS syscalls.c
- * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp 
-<<<<
  */
 
 char *syscallnames[] = {

==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#28 (text+ko) ====

@@ -2,16 +2,8 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
->>>> ORIGINAL syscall.h#15
- * $FreeBSD: src/sys/sys/syscall.h,v 1.115 2002/08/06 15:16:55 rwatson Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp 
-==== THEIRS syscall.h#16
- * $FreeBSD: src/sys/sys/syscall.h,v 1.116 2002/08/19 20:02:29 rwatson Exp $
+ * $FreeBSD$
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp 
-==== YOURS syscall.h
- * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp 
-<<<<
  */
 
 #define	SYS_syscall	0

==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#28 (text+ko) ====

@@ -1,15 +1,7 @@
 # FreeBSD system call names.
 # DO NOT EDIT-- this file is automatically generated.
->>>> ORIGINAL syscall.mk#15
-# $FreeBSD: src/sys/sys/syscall.mk,v 1.70 2002/08/06 15:16:55 rwatson Exp $
-# created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp 
-==== THEIRS syscall.mk#16
-# $FreeBSD: src/sys/sys/syscall.mk,v 1.71 2002/08/19 20:02:29 rwatson Exp $
+# $FreeBSD$
 # created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp 
-==== YOURS syscall.mk
-# $FreeBSD$
-# created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp 
-<<<<
 MIASM =  \
 	syscall.o \
 	exit.o \

==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#29 (text+ko) ====

@@ -2,16 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
->>>> ORIGINAL sysproto.h#16
- * $FreeBSD: src/sys/sys/sysproto.h,v 1.107 2002/08/06 15:16:55 rwatson Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp 
-==== THEIRS sysproto.h#17
- * $FreeBSD: src/sys/sys/sysproto.h,v 1.108 2002/08/19 20:02:29 rwatson Exp $
+ * $FreeBSD$
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp 
-==== YOURS sysproto.h
- * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp 
-<<<<
  */
 
 #ifndef _SYS_SYSPROTO_H_
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message