Date: Fri, 28 Jun 2002 19:07:00 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13559 for review Message-ID: <200206290207.g5T270Ct083508@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13559 Change 13559 by rwatson@rwatson_tislabs on 2002/06/28 19:06:03 Rebuild system call tables from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#19 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#19 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#20 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#20 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#19 (text+ko) ==== @@ -2,16 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL init_sysent.c#8 - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.121 2002/04/17 13:06:35 mux Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== THEIRS init_sysent.c#9 - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.124 2002/06/13 23:44:50 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp -==== YOURS init_sysent.c - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.110 2002/04/17 13:05:13 mux Exp -<<<< */ #include "opt_compat.h" @@ -421,11 +413,6 @@ { SYF_MPSAFE | AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd }, /* 388 = __mac_set_fd */ { SYF_MPSAFE | AS(__mac_set_file_args), (sy_call_t *)__mac_set_file }, /* 389 = __mac_set_file */ { AS(kenv_args), (sy_call_t *)kenv }, /* 390 = kenv */ ->>>> ORIGINAL init_sysent.c#8 -==== THEIRS init_sysent.c#9 { AS(lchflags_args), (sy_call_t *)lchflags }, /* 391 = lchflags */ { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ -==== YOURS init_sysent.c - { 0, (sy_call_t *)nosys }, /* 391 = lchflags */ -<<<< }; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#19 (text+ko) ==== @@ -2,16 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscalls.c#8 - * $FreeBSD: src/sys/kern/syscalls.c,v 1.108 2002/04/17 13:06:36 mux Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== THEIRS syscalls.c#9 - * $FreeBSD: src/sys/kern/syscalls.c,v 1.111 2002/06/13 23:44:50 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp -==== YOURS syscalls.c - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.110 2002/04/17 13:05:13 mux Exp -<<<< */ char *syscallnames[] = { @@ -406,11 +398,6 @@ "__mac_set_fd", /* 388 = __mac_set_fd */ "__mac_set_file", /* 389 = __mac_set_file */ "kenv", /* 390 = kenv */ ->>>> ORIGINAL syscalls.c#8 -==== THEIRS syscalls.c#9 "lchflags", /* 391 = lchflags */ "uuidgen", /* 392 = uuidgen */ -==== YOURS syscalls.c - "#391", /* 391 = lchflags */ -<<<< }; ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#20 (text+ko) ==== @@ -2,16 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscall.h#9 - * $FreeBSD: src/sys/sys/syscall.h,v 1.107 2002/04/17 13:06:36 mux Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== THEIRS syscall.h#10 - * $FreeBSD: src/sys/sys/syscall.h,v 1.110 2002/06/13 23:44:50 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp -==== YOURS syscall.h - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.110 2002/04/17 13:05:13 mux Exp -<<<< */ #define SYS_syscall 0 @@ -312,12 +304,6 @@ #define SYS___mac_set_fd 388 #define SYS___mac_set_file 389 #define SYS_kenv 390 ->>>> ORIGINAL syscall.h#9 -#define SYS_MAXSYSCALL 391 -==== THEIRS syscall.h#10 #define SYS_lchflags 391 #define SYS_uuidgen 392 #define SYS_MAXSYSCALL 393 -==== YOURS syscall.h -#define SYS_MAXSYSCALL 392 -<<<< ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#20 (text+ko) ==== @@ -1,15 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscall.mk#9 -# $FreeBSD: src/sys/sys/syscall.mk,v 1.62 2002/04/17 13:06:36 mux Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== THEIRS syscall.mk#10 -# $FreeBSD: src/sys/sys/syscall.mk,v 1.65 2002/06/13 23:44:50 rwatson Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp -==== YOURS syscall.mk -# $FreeBSD$ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.110 2002/04/17 13:05:13 mux Exp -<<<< MIASM = \ syscall.o \ exit.o \ @@ -255,18 +247,12 @@ kse_new.o \ thread_wakeup.o \ kse_yield.o \ ->>>> ORIGINAL syscall.mk#9 - kenv.o -==== THEIRS syscall.mk#10 - kenv.o \ - lchflags.o \ - uuidgen.o -==== YOURS syscall.mk __mac_get_proc.o \ __mac_set_proc.o \ __mac_get_fd.o \ __mac_get_file.o \ __mac_set_fd.o \ __mac_set_file.o \ - kenv.o -<<<< + kenv.o \ + lchflags.o \ + uuidgen.o ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#21 (text+ko) ==== @@ -2,16 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL sysproto.h#10 - * $FreeBSD: src/sys/sys/sysproto.h,v 1.99 2002/04/17 13:06:36 mux Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== THEIRS sysproto.h#11 - * $FreeBSD: src/sys/sys/sysproto.h,v 1.102 2002/06/13 23:44:50 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp -==== YOURS sysproto.h - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.110 2002/04/17 13:05:13 mux Exp -<<<< */ #ifndef _SYS_SYSPROTO_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206290207.g5T270Ct083508>