Date: Thu, 9 Mar 2006 02:25:24 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 93011 for review Message-ID: <200603090225.k292POSt047656@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=93011 Change 93011 by rwatson@rwatson_peppercorn on 2006/03/09 02:24:57 Move __mac_get_fs() to the bottom of the system call table so as not to conflict with other allocated system calls now merged from FreeBSD. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#18 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#19 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#18 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#19 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#19 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#19 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#18 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.210 2006/03/01 06:49:38 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -494,4 +494,5 @@ { SYF_MPSAFE | AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 462 = kmq_unlink */ { SYF_MPSAFE | AS(abort2_args), (sy_call_t *)abort2, AUE_NULL }, /* 463 = abort2 */ { SYF_MPSAFE | AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL }, /* 464 = thr_set_name */ + { SYF_MPSAFE | AS(__mac_get_fs_args), (sy_call_t *)__mac_get_fs, AUE_NULL }, /* 465 = __mac_get_fs */ }; ==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#19 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.194 2006/03/01 06:49:38 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -472,4 +472,5 @@ "kmq_unlink", /* 462 = kmq_unlink */ "abort2", /* 463 = abort2 */ "thr_set_name", /* 464 = thr_set_name */ + "__mac_get_fs", /* 465 = __mac_get_fs */ }; ==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#18 (text+ko) ==== @@ -798,8 +798,6 @@ long id, void *uaddr, void *uaddr2); } 455 AUE_NULL MSTD { int thr_new(struct thr_param *param, \ int param_size); } -456 AUE_NULL MSTD { int __mac_get_fs(const char *path_p, \ - struct mac *mac_p); } 456 AUE_NULL MSTD { int sigqueue(pid_t pid, int signum, void *value); } 457 AUE_NULL MNOSTD { int kmq_open(const char *path, int flags, \ mode_t mode, const struct mq_attr *attr); } @@ -819,5 +817,7 @@ 462 AUE_NULL MNOSTD { int kmq_unlink(const char *path); } 463 AUE_NULL MSTD { int abort2(const char *why, int nargs, void **args); } 464 AUE_NULL MSTD { int thr_set_name(long id, const char *name); } +465 AUE_NULL MSTD { int __mac_get_fs(const char *path_p, \ + struct mac *mac_p); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#19 (text+ko) ==== @@ -2,6 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -387,4 +388,5 @@ #define SYS_kmq_unlink 462 #define SYS_abort2 463 #define SYS_thr_set_name 464 -#define SYS_MAXSYSCALL 465 +#define SYS___mac_get_fs 465 +#define SYS_MAXSYSCALL 466 ==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#19 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.146 2006/03/01 06:49:38 davidxu Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp MIASM = \ syscall.o \ @@ -329,4 +329,5 @@ kmq_notify.o \ kmq_unlink.o \ abort2.o \ - thr_set_name.o + thr_set_name.o \ + __mac_get_fs.o ==== //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#19 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.191 2006/03/01 06:49:38 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -1443,6 +1443,10 @@ char id_l_[PADL_(long)]; long id; char id_r_[PADR_(long)]; char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; }; +struct __mac_get_fs_args { + char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)]; + char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1769,6 +1773,7 @@ int kmq_unlink(struct thread *, struct kmq_unlink_args *); int abort2(struct thread *, struct abort2_args *); int thr_set_name(struct thread *, struct thr_set_name_args *); +int __mac_get_fs(struct thread *, struct __mac_get_fs_args *); #ifdef COMPAT_43
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603090225.k292POSt047656>