From 942ae5c8b8934fb60246540400a0f0765b991e25 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Tue, 10 Jul 2018 14:04:52 +0000 Subject: [PATCH] Regen after r336171. --- sys/compat/freebsd32/freebsd32_syscall.h | 4 +- sys/compat/freebsd32/freebsd32_syscalls.c | 4 +- sys/compat/freebsd32/freebsd32_sysent.c | 4 +- .../freebsd32/freebsd32_systrace_args.c | 60 ------------------- sys/kern/init_sysent.c | 4 +- sys/kern/syscalls.c | 4 +- sys/kern/systrace_args.c | 60 ------------------- sys/sys/syscall.h | 4 +- sys/sys/syscall.mk | 2 - 9 files changed, 12 insertions(+), 134 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 24f52aa620b9..31234aa5efc5 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -226,9 +226,9 @@ #define FREEBSD32_SYS_freebsd32_lio_listio 257 #define FREEBSD32_SYS_freebsd11_freebsd32_getdents 272 #define FREEBSD32_SYS_lchmod 274 -#define FREEBSD32_SYS_netbsd_lchown 275 + /* 275 is obsolete netbsd_lchown */ #define FREEBSD32_SYS_freebsd32_lutimes 276 -#define FREEBSD32_SYS_netbsd_msync 277 + /* 277 is obsolete netbsd_msync */ #define FREEBSD32_SYS_freebsd11_nstat 278 #define FREEBSD32_SYS_freebsd11_nfstat 279 #define FREEBSD32_SYS_freebsd11_nlstat 280 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index e9767109ba27..db79dcfacf63 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -284,9 +284,9 @@ const char *freebsd32_syscallnames[] = { "compat11.freebsd32_getdents", /* 272 = freebsd11 freebsd32_getdents */ "#273", /* 273 = nosys */ "lchmod", /* 274 = lchmod */ - "netbsd_lchown", /* 275 = netbsd_lchown */ + "obs_netbsd_lchown", /* 275 = obsolete netbsd_lchown */ "freebsd32_lutimes", /* 276 = freebsd32_lutimes */ - "netbsd_msync", /* 277 = netbsd_msync */ + "obs_netbsd_msync", /* 277 = obsolete netbsd_msync */ "compat11.nstat", /* 278 = freebsd11 nstat */ "compat11.nfstat", /* 279 = freebsd11 nfstat */ "compat11.nlstat", /* 280 = freebsd11 nlstat */ diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index dbb65950e431..e3ef24c441cf 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -331,9 +331,9 @@ struct sysent freebsd32_sysent[] = { { compat11(AS(freebsd11_freebsd32_getdents_args),freebsd32_getdents), AUE_O_GETDENTS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 272 = freebsd11 freebsd32_getdents */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 273 = nosys */ { AS(lchmod_args), (sy_call_t *)sys_lchmod, AUE_LCHMOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 274 = lchmod */ - { AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 275 = netbsd_lchown */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 275 = obsolete netbsd_lchown */ { AS(freebsd32_lutimes_args), (sy_call_t *)freebsd32_lutimes, AUE_LUTIMES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 276 = freebsd32_lutimes */ - { AS(msync_args), (sy_call_t *)sys_msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 277 = netbsd_msync */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 277 = obsolete netbsd_msync */ { compat11(AS(freebsd11_nstat_args),nstat), AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 278 = freebsd11 nstat */ { compat11(AS(freebsd11_nfstat_args),nfstat), AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 279 = freebsd11 nfstat */ { compat11(AS(freebsd11_nlstat_args),nlstat), AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 280 = freebsd11 nlstat */ diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index ee4c5c55122a..bb66d8a7690b 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -1292,15 +1292,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } - /* lchown */ - case 275: { - struct lchown_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = p->uid; /* uid_t */ - iarg[2] = p->gid; /* gid_t */ - *n_args = 3; - break; - } /* freebsd32_lutimes */ case 276: { struct freebsd32_lutimes_args *p = params; @@ -1309,15 +1300,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } - /* msync */ - case 277: { - struct msync_args *p = params; - uarg[0] = (intptr_t) p->addr; /* void * */ - uarg[1] = p->len; /* size_t */ - iarg[2] = p->flags; /* int */ - *n_args = 3; - break; - } /* freebsd32_preadv */ case 289: { struct freebsd32_preadv_args *p = params; @@ -5316,22 +5298,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* lchown */ - case 275: - switch(ndx) { - case 0: - p = "userland char *"; - break; - case 1: - p = "uid_t"; - break; - case 2: - p = "gid_t"; - break; - default: - break; - }; - break; /* freebsd32_lutimes */ case 276: switch(ndx) { @@ -5345,22 +5311,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* msync */ - case 277: - switch(ndx) { - case 0: - p = "userland void *"; - break; - case 1: - p = "size_t"; - break; - case 2: - p = "int"; - break; - default: - break; - }; - break; /* freebsd32_preadv */ case 289: switch(ndx) { @@ -9557,21 +9507,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* lchown */ - case 275: - if (ndx == 0 || ndx == 1) - p = "int"; - break; /* freebsd32_lutimes */ case 276: if (ndx == 0 || ndx == 1) p = "int"; break; - /* msync */ - case 277: - if (ndx == 0 || ndx == 1) - p = "int"; - break; /* freebsd32_preadv */ case 289: if (ndx == 0 || ndx == 1) diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 849882216657..ea2c59a08067 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -324,9 +324,9 @@ struct sysent sysent[] = { { compat11(AS(freebsd11_getdents_args),getdents), AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 272 = freebsd11 getdents */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 273 = nosys */ { AS(lchmod_args), (sy_call_t *)sys_lchmod, AUE_LCHMOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 274 = lchmod */ - { AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 275 = netbsd_lchown */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 275 = obsolete netbsd_lchown */ { AS(lutimes_args), (sy_call_t *)sys_lutimes, AUE_LUTIMES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 276 = lutimes */ - { AS(msync_args), (sy_call_t *)sys_msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 277 = netbsd_msync */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 277 = obsolete netbsd_msync */ { compat11(AS(freebsd11_nstat_args),nstat), AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 278 = freebsd11 nstat */ { compat11(AS(freebsd11_nfstat_args),nfstat), AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 279 = freebsd11 nfstat */ { compat11(AS(freebsd11_nlstat_args),nlstat), AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 280 = freebsd11 nlstat */ diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 90702561a8ec..a107b5571b3c 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -281,9 +281,9 @@ const char *syscallnames[] = { "compat11.getdents", /* 272 = freebsd11 getdents */ "#273", /* 273 = nosys */ "lchmod", /* 274 = lchmod */ - "netbsd_lchown", /* 275 = netbsd_lchown */ + "obs_netbsd_lchown", /* 275 = obsolete netbsd_lchown */ "lutimes", /* 276 = lutimes */ - "netbsd_msync", /* 277 = netbsd_msync */ + "obs_netbsd_msync", /* 277 = obsolete netbsd_msync */ "compat11.nstat", /* 278 = freebsd11 nstat */ "compat11.nfstat", /* 279 = freebsd11 nfstat */ "compat11.nlstat", /* 280 = freebsd11 nlstat */ diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index ad00bd935cbc..b1286261f56d 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -1328,15 +1328,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } - /* lchown */ - case 275: { - struct lchown_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = p->uid; /* uid_t */ - iarg[2] = p->gid; /* gid_t */ - *n_args = 3; - break; - } /* lutimes */ case 276: { struct lutimes_args *p = params; @@ -1345,15 +1336,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } - /* msync */ - case 277: { - struct msync_args *p = params; - uarg[0] = (intptr_t) p->addr; /* void * */ - uarg[1] = p->len; /* size_t */ - iarg[2] = p->flags; /* int */ - *n_args = 3; - break; - } /* preadv */ case 289: { struct preadv_args *p = params; @@ -5383,22 +5365,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* lchown */ - case 275: - switch(ndx) { - case 0: - p = "userland char *"; - break; - case 1: - p = "uid_t"; - break; - case 2: - p = "gid_t"; - break; - default: - break; - }; - break; /* lutimes */ case 276: switch(ndx) { @@ -5412,22 +5378,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* msync */ - case 277: - switch(ndx) { - case 0: - p = "userland void *"; - break; - case 1: - p = "size_t"; - break; - case 2: - p = "int"; - break; - default: - break; - }; - break; /* preadv */ case 289: switch(ndx) { @@ -9531,21 +9481,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* lchown */ - case 275: - if (ndx == 0 || ndx == 1) - p = "int"; - break; /* lutimes */ case 276: if (ndx == 0 || ndx == 1) p = "int"; break; - /* msync */ - case 277: - if (ndx == 0 || ndx == 1) - p = "int"; - break; /* preadv */ case 289: if (ndx == 0 || ndx == 1) diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 0135eb378260..6e880f04950c 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -231,9 +231,9 @@ #define SYS_lio_listio 257 #define SYS_freebsd11_getdents 272 #define SYS_lchmod 274 -#define SYS_netbsd_lchown 275 + /* 275 is obsolete netbsd_lchown */ #define SYS_lutimes 276 -#define SYS_netbsd_msync 277 + /* 277 is obsolete netbsd_msync */ #define SYS_freebsd11_nstat 278 #define SYS_freebsd11_nfstat 279 #define SYS_freebsd11_nlstat 280 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index e2b76ef47706..11d81fab83f3 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -170,9 +170,7 @@ MIASM = \ lio_listio.o \ freebsd11_getdents.o \ lchmod.o \ - netbsd_lchown.o \ lutimes.o \ - netbsd_msync.o \ freebsd11_nstat.o \ freebsd11_nfstat.o \ freebsd11_nlstat.o \