From e7fb66340e060b9837c228fde0b7155592cb42b2 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Mon, 30 Aug 2010 14:26:02 +0000 Subject: [PATCH] Regen --- sys/kern/init_sysent.c | 6 ++-- sys/kern/syscalls.c | 6 ++-- sys/kern/systrace_args.c | 74 ++++++++++++++++++++++++++++++++++++++++ sys/sys/syscall.h | 4 ++- sys/sys/syscall.mk | 4 ++- sys/sys/sysproto.h | 22 +++++++++++- 6 files changed, 107 insertions(+), 9 deletions(-) diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index ae10abeb4747..706c966e3af0 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 209579 2010-06-28 18:06:46Z kib + * created from FreeBSD: head/sys/kern/syscalls.master 211998 2010-08-30 14:24:44Z kib */ #include "opt_compat.h" @@ -373,7 +373,7 @@ struct sysent sysent[] = { { compat4(AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 336 = freebsd4 sendfile */ { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 337 = kldsym */ { AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 338 = jail */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 339 = pioctl */ + { AS(nnpfs_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 339 = nnpfs_syscall */ { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 340 = sigprocmask */ { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, 0, SY_THR_STATIC }, /* 341 = sigsuspend */ { compat4(AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, 0, SY_THR_STATIC }, /* 342 = freebsd4 sigaction */ @@ -411,7 +411,7 @@ struct sysent sysent[] = { { AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 374 = __setugid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 375 = nfsclnt */ { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 376 = eaccess */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 377 = afs_syscall */ + { AS(afs3_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 377 = afs3_syscall */ { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 378 = nmount */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 379 = kse_exit */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 380 = kse_wakeup */ diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index e783799c1920..77cc53f0a9a2 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 209579 2010-06-28 18:06:46Z kib + * created from FreeBSD: head/sys/kern/syscalls.master 211998 2010-08-30 14:24:44Z kib */ const char *syscallnames[] = { @@ -346,7 +346,7 @@ const char *syscallnames[] = { "compat4.sendfile", /* 336 = freebsd4 sendfile */ "kldsym", /* 337 = kldsym */ "jail", /* 338 = jail */ - "#339", /* 339 = pioctl */ + "nnpfs_syscall", /* 339 = nnpfs_syscall */ "sigprocmask", /* 340 = sigprocmask */ "sigsuspend", /* 341 = sigsuspend */ "compat4.sigaction", /* 342 = freebsd4 sigaction */ @@ -384,7 +384,7 @@ const char *syscallnames[] = { "__setugid", /* 374 = __setugid */ "#375", /* 375 = nfsclnt */ "eaccess", /* 376 = eaccess */ - "#377", /* 377 = afs_syscall */ + "afs3_syscall", /* 377 = afs3_syscall */ "nmount", /* 378 = nmount */ "#379", /* 379 = kse_exit */ "#380", /* 380 = kse_wakeup */ diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 743ad033dd9a..4b95f010ea78 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -1770,6 +1770,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } + /* nnpfs_syscall */ + case 339: { + struct nnpfs_syscall_args *p = params; + iarg[0] = p->operation; /* int */ + uarg[1] = (intptr_t) p->a_pathP; /* char * */ + iarg[2] = p->a_opcode; /* int */ + uarg[3] = (intptr_t) p->a_paramsP; /* void * */ + iarg[4] = p->a_followSymlinks; /* int */ + *n_args = 5; + break; + } /* sigprocmask */ case 340: { struct sigprocmask_args *p = params; @@ -2011,6 +2022,19 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } + /* afs3_syscall */ + case 377: { + struct afs3_syscall_args *p = params; + iarg[0] = p->syscall; /* long */ + iarg[1] = p->parm1; /* long */ + iarg[2] = p->parm2; /* long */ + iarg[3] = p->parm3; /* long */ + iarg[4] = p->parm4; /* long */ + iarg[5] = p->parm5; /* long */ + iarg[6] = p->parm6; /* long */ + *n_args = 7; + break; + } /* nmount */ case 378: { struct nmount_args *p = params; @@ -5900,6 +5924,28 @@ systrace_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* nnpfs_syscall */ + case 339: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "char *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "void *"; + break; + case 4: + p = "int"; + break; + default: + break; + }; + break; /* sigprocmask */ case 340: switch(ndx) { @@ -6325,6 +6371,34 @@ systrace_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* afs3_syscall */ + case 377: + switch(ndx) { + case 0: + p = "long"; + break; + case 1: + p = "long"; + break; + case 2: + p = "long"; + break; + case 3: + p = "long"; + break; + case 4: + p = "long"; + break; + case 5: + p = "long"; + break; + case 6: + p = "long"; + break; + default: + break; + }; + break; /* nmount */ case 378: switch(ndx) { diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index e7371f247a49..64e36064521d 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 209579 2010-06-28 18:06:46Z kib + * created from FreeBSD: head/sys/kern/syscalls.master 211998 2010-08-30 14:24:44Z kib */ #define SYS_syscall 0 @@ -277,6 +277,7 @@ #define SYS_freebsd4_sendfile 336 #define SYS_kldsym 337 #define SYS_jail 338 +#define SYS_nnpfs_syscall 339 #define SYS_sigprocmask 340 #define SYS_sigsuspend 341 #define SYS_freebsd4_sigaction 342 @@ -306,6 +307,7 @@ #define SYS_extattr_delete_fd 373 #define SYS___setugid 374 #define SYS_eaccess 376 +#define SYS_afs3_syscall 377 #define SYS_nmount 378 #define SYS___mac_get_proc 384 #define SYS___mac_set_proc 385 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 8c8d1351beeb..645b113cc278 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. # $FreeBSD$ -# created from FreeBSD: head/sys/kern/syscalls.master 209579 2010-06-28 18:06:46Z kib +# created from FreeBSD: head/sys/kern/syscalls.master 211998 2010-08-30 14:24:44Z kib MIASM = \ syscall.o \ exit.o \ @@ -226,6 +226,7 @@ MIASM = \ freebsd4_sendfile.o \ kldsym.o \ jail.o \ + nnpfs_syscall.o \ sigprocmask.o \ sigsuspend.o \ freebsd4_sigaction.o \ @@ -255,6 +256,7 @@ MIASM = \ extattr_delete_fd.o \ __setugid.o \ eaccess.o \ + afs3_syscall.o \ nmount.o \ __mac_get_proc.o \ __mac_set_proc.o \ diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 5f86f3d8314b..e1b35fe1ded7 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/kern/syscalls.master 209579 2010-06-28 18:06:46Z kib + * created from FreeBSD: head/sys/kern/syscalls.master 211998 2010-08-30 14:24:44Z kib */ #ifndef _SYS_SYSPROTO_H_ @@ -933,6 +933,13 @@ struct kldsym_args { struct jail_args { char jail_l_[PADL_(struct jail *)]; struct jail * jail; char jail_r_[PADR_(struct jail *)]; }; +struct nnpfs_syscall_args { + char operation_l_[PADL_(int)]; int operation; char operation_r_[PADR_(int)]; + char a_pathP_l_[PADL_(char *)]; char * a_pathP; char a_pathP_r_[PADR_(char *)]; + char a_opcode_l_[PADL_(int)]; int a_opcode; char a_opcode_r_[PADR_(int)]; + char a_paramsP_l_[PADL_(void *)]; void * a_paramsP; char a_paramsP_r_[PADR_(void *)]; + char a_followSymlinks_l_[PADL_(int)]; int a_followSymlinks; char a_followSymlinks_r_[PADR_(int)]; +}; struct sigprocmask_args { char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)]; char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; @@ -1068,6 +1075,15 @@ struct eaccess_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; +struct afs3_syscall_args { + char syscall_l_[PADL_(long)]; long syscall; char syscall_r_[PADR_(long)]; + char parm1_l_[PADL_(long)]; long parm1; char parm1_r_[PADR_(long)]; + char parm2_l_[PADL_(long)]; long parm2; char parm2_r_[PADR_(long)]; + char parm3_l_[PADL_(long)]; long parm3; char parm3_r_[PADR_(long)]; + char parm4_l_[PADL_(long)]; long parm4; char parm4_r_[PADR_(long)]; + char parm5_l_[PADL_(long)]; long parm5; char parm5_r_[PADR_(long)]; + char parm6_l_[PADL_(long)]; long parm6; char parm6_r_[PADR_(long)]; +}; struct nmount_args { char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)]; char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)]; @@ -1858,6 +1874,7 @@ int sched_rr_get_interval(struct thread *, struct sched_rr_get_interval_args *); int utrace(struct thread *, struct utrace_args *); int kldsym(struct thread *, struct kldsym_args *); int jail(struct thread *, struct jail_args *); +int nnpfs_syscall(struct thread *, struct nnpfs_syscall_args *); int sigprocmask(struct thread *, struct sigprocmask_args *); int sigsuspend(struct thread *, struct sigsuspend_args *); int sigpending(struct thread *, struct sigpending_args *); @@ -1885,6 +1902,7 @@ int extattr_get_fd(struct thread *, struct extattr_get_fd_args *); int extattr_delete_fd(struct thread *, struct extattr_delete_fd_args *); int __setugid(struct thread *, struct __setugid_args *); int eaccess(struct thread *, struct eaccess_args *); +int afs3_syscall(struct thread *, struct afs3_syscall_args *); int nmount(struct thread *, struct nmount_args *); int __mac_get_proc(struct thread *, struct __mac_get_proc_args *); int __mac_set_proc(struct thread *, struct __mac_set_proc_args *); @@ -2529,6 +2547,7 @@ int freebsd7_shmctl(struct thread *, struct freebsd7_shmctl_args *); #define SYS_AUE_freebsd4_sendfile AUE_SENDFILE #define SYS_AUE_kldsym AUE_NULL #define SYS_AUE_jail AUE_JAIL +#define SYS_AUE_nnpfs_syscall AUE_NULL #define SYS_AUE_sigprocmask AUE_SIGPROCMASK #define SYS_AUE_sigsuspend AUE_SIGSUSPEND #define SYS_AUE_freebsd4_sigaction AUE_SIGACTION @@ -2558,6 +2577,7 @@ int freebsd7_shmctl(struct thread *, struct freebsd7_shmctl_args *); #define SYS_AUE_extattr_delete_fd AUE_EXTATTR_DELETE_FD #define SYS_AUE___setugid AUE_NULL #define SYS_AUE_eaccess AUE_EACCESS +#define SYS_AUE_afs3_syscall AUE_NULL #define SYS_AUE_nmount AUE_NMOUNT #define SYS_AUE___mac_get_proc AUE_NULL #define SYS_AUE___mac_set_proc AUE_NULL