svn commit: r304402 - in head: . sys/compat/freebsd32 sys/kern sys/sys
George V. Neville-Neil
gnn at FreeBSD.org
Thu Aug 18 10:54:41 UTC 2016
Author: gnn
Date: Thu Aug 18 10:54:39 2016
New Revision: 304402
URL: https://svnweb.freebsd.org/changeset/base/304402
Log:
Remove the obsolete and unused openbsd_poll system call. (Phase 2)
Reported by: brooks
Reviewed by: brooks, jhb
Differential Revision: https://reviews.freebsd.org/D7548
Modified:
head/UPDATING
head/sys/compat/freebsd32/freebsd32_proto.h
head/sys/compat/freebsd32/freebsd32_syscall.h
head/sys/compat/freebsd32/freebsd32_syscalls.c
head/sys/compat/freebsd32/freebsd32_sysent.c
head/sys/compat/freebsd32/freebsd32_systrace_args.c
head/sys/kern/init_sysent.c
head/sys/kern/syscalls.c
head/sys/kern/systrace_args.c
head/sys/sys/syscall.h
head/sys/sys/syscall.mk
head/sys/sys/sysproto.h
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Thu Aug 18 10:54:21 2016 (r304401)
+++ head/UPDATING Thu Aug 18 10:54:39 2016 (r304402)
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20160818:
+ Remove the openbsd_poll system call.
+ __FreeBSD_version has been bumped because of this.
+
20160622:
The libc stub for the pipe(2) system call has been replaced with
a wrapper that calls the pipe2(2) system call and the pipe(2)
Modified: head/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_proto.h Thu Aug 18 10:54:21 2016 (r304401)
+++ head/sys/compat/freebsd32/freebsd32_proto.h Thu Aug 18 10:54:39 2016 (r304402)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 304176 2016-08-15 19:08:51Z kib
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 304395 2016-08-18 10:50:40Z gnn
*/
#ifndef _FREEBSD32_SYSPROTO_H_
Modified: head/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscall.h Thu Aug 18 10:54:21 2016 (r304401)
+++ head/sys/compat/freebsd32/freebsd32_syscall.h Thu Aug 18 10:54:39 2016 (r304402)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 304176 2016-08-15 19:08:51Z kib
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 304395 2016-08-18 10:50:40Z gnn
*/
#define FREEBSD32_SYS_syscall 0
@@ -218,7 +218,7 @@
#define FREEBSD32_SYS_freebsd32_clock_getcpuclockid2 247
#define FREEBSD32_SYS_minherit 250
#define FREEBSD32_SYS_rfork 251
-#define FREEBSD32_SYS_openbsd_poll 252
+ /* 252 is obsolete openbsd_poll */
#define FREEBSD32_SYS_issetugid 253
#define FREEBSD32_SYS_lchown 254
#define FREEBSD32_SYS_freebsd32_aio_read 255
Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscalls.c Thu Aug 18 10:54:21 2016 (r304401)
+++ head/sys/compat/freebsd32/freebsd32_syscalls.c Thu Aug 18 10:54:39 2016 (r304402)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 304176 2016-08-15 19:08:51Z kib
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 304395 2016-08-18 10:50:40Z gnn
*/
const char *freebsd32_syscallnames[] = {
@@ -262,7 +262,7 @@ const char *freebsd32_syscallnames[] = {
"#249", /* 249 = nosys */
"minherit", /* 250 = minherit */
"rfork", /* 251 = rfork */
- "openbsd_poll", /* 252 = openbsd_poll */
+ "obs_openbsd_poll", /* 252 = obsolete openbsd_poll */
"issetugid", /* 253 = issetugid */
"lchown", /* 254 = lchown */
"freebsd32_aio_read", /* 255 = freebsd32_aio_read */
Modified: head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_sysent.c Thu Aug 18 10:54:21 2016 (r304401)
+++ head/sys/compat/freebsd32/freebsd32_sysent.c Thu Aug 18 10:54:39 2016 (r304402)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 304176 2016-08-15 19:08:51Z kib
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 304395 2016-08-18 10:50:40Z gnn
*/
#include "opt_compat.h"
@@ -305,7 +305,7 @@ struct sysent freebsd32_sysent[] = {
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 249 = nosys */
{ AS(minherit_args), (sy_call_t *)sys_minherit, AUE_MINHERIT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 250 = minherit */
{ AS(rfork_args), (sy_call_t *)sys_rfork, AUE_RFORK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 251 = rfork */
- { AS(openbsd_poll_args), (sy_call_t *)sys_openbsd_poll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 252 = openbsd_poll */
+ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 252 = obsolete openbsd_poll */
{ 0, (sy_call_t *)sys_issetugid, AUE_ISSETUGID, NULL, 0, 0, 0, SY_THR_STATIC }, /* 253 = issetugid */
{ AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 254 = lchown */
{ AS(freebsd32_aio_read_args), (sy_call_t *)freebsd32_aio_read, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 255 = freebsd32_aio_read */
Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_systrace_args.c Thu Aug 18 10:54:21 2016 (r304401)
+++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Thu Aug 18 10:54:39 2016 (r304402)
@@ -1286,15 +1286,6 @@ systrace_args(int sysnum, void *params,
*n_args = 1;
break;
}
- /* openbsd_poll */
- case 252: {
- struct openbsd_poll_args *p = params;
- uarg[0] = (intptr_t) p->fds; /* struct pollfd * */
- uarg[1] = p->nfds; /* u_int */
- iarg[2] = p->timeout; /* int */
- *n_args = 3;
- break;
- }
/* issetugid */
case 253: {
*n_args = 0;
@@ -5357,22 +5348,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* openbsd_poll */
- case 252:
- switch(ndx) {
- case 0:
- p = "struct pollfd *";
- break;
- case 1:
- p = "u_int";
- break;
- case 2:
- p = "int";
- break;
- default:
- break;
- };
- break;
/* issetugid */
case 253:
break;
@@ -9666,11 +9641,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* openbsd_poll */
- case 252:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
/* issetugid */
case 253:
/* lchown */
Modified: head/sys/kern/init_sysent.c
==============================================================================
--- head/sys/kern/init_sysent.c Thu Aug 18 10:54:21 2016 (r304401)
+++ head/sys/kern/init_sysent.c Thu Aug 18 10:54:39 2016 (r304402)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/kern/syscalls.master 304176 2016-08-15 19:08:51Z kib
+ * created from FreeBSD: head/sys/kern/syscalls.master 304395 2016-08-18 10:50:40Z gnn
*/
#include "opt_compat.h"
@@ -298,7 +298,7 @@ struct sysent sysent[] = {
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 249 = nosys */
{ AS(minherit_args), (sy_call_t *)sys_minherit, AUE_MINHERIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 250 = minherit */
{ AS(rfork_args), (sy_call_t *)sys_rfork, AUE_RFORK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 251 = rfork */
- { AS(openbsd_poll_args), (sy_call_t *)sys_openbsd_poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 252 = openbsd_poll */
+ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 252 = obsolete openbsd_poll */
{ 0, (sy_call_t *)sys_issetugid, AUE_ISSETUGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 253 = issetugid */
{ AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 254 = lchown */
{ AS(aio_read_args), (sy_call_t *)sys_aio_read, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 255 = aio_read */
Modified: head/sys/kern/syscalls.c
==============================================================================
--- head/sys/kern/syscalls.c Thu Aug 18 10:54:21 2016 (r304401)
+++ head/sys/kern/syscalls.c Thu Aug 18 10:54:39 2016 (r304402)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/kern/syscalls.master 304176 2016-08-15 19:08:51Z kib
+ * created from FreeBSD: head/sys/kern/syscalls.master 304395 2016-08-18 10:50:40Z gnn
*/
const char *syscallnames[] = {
@@ -259,7 +259,7 @@ const char *syscallnames[] = {
"#249", /* 249 = nosys */
"minherit", /* 250 = minherit */
"rfork", /* 251 = rfork */
- "openbsd_poll", /* 252 = openbsd_poll */
+ "obs_openbsd_poll", /* 252 = obsolete openbsd_poll */
"issetugid", /* 253 = issetugid */
"lchown", /* 254 = lchown */
"aio_read", /* 255 = aio_read */
Modified: head/sys/kern/systrace_args.c
==============================================================================
--- head/sys/kern/systrace_args.c Thu Aug 18 10:54:21 2016 (r304401)
+++ head/sys/kern/systrace_args.c Thu Aug 18 10:54:39 2016 (r304402)
@@ -1322,15 +1322,6 @@ systrace_args(int sysnum, void *params,
*n_args = 1;
break;
}
- /* openbsd_poll */
- case 252: {
- struct openbsd_poll_args *p = params;
- uarg[0] = (intptr_t) p->fds; /* struct pollfd * */
- uarg[1] = p->nfds; /* u_int */
- iarg[2] = p->timeout; /* int */
- *n_args = 3;
- break;
- }
/* issetugid */
case 253: {
*n_args = 0;
@@ -5426,22 +5417,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* openbsd_poll */
- case 252:
- switch(ndx) {
- case 0:
- p = "struct pollfd *";
- break;
- case 1:
- p = "u_int";
- break;
- case 2:
- p = "int";
- break;
- default:
- break;
- };
- break;
/* issetugid */
case 253:
break;
@@ -9648,11 +9623,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* openbsd_poll */
- case 252:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
/* issetugid */
case 253:
/* lchown */
Modified: head/sys/sys/syscall.h
==============================================================================
--- head/sys/sys/syscall.h Thu Aug 18 10:54:21 2016 (r304401)
+++ head/sys/sys/syscall.h Thu Aug 18 10:54:39 2016 (r304402)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/kern/syscalls.master 304176 2016-08-15 19:08:51Z kib
+ * created from FreeBSD: head/sys/kern/syscalls.master 304395 2016-08-18 10:50:40Z gnn
*/
#define SYS_syscall 0
@@ -223,7 +223,7 @@
#define SYS_ntp_gettime 248
#define SYS_minherit 250
#define SYS_rfork 251
-#define SYS_openbsd_poll 252
+ /* 252 is obsolete openbsd_poll */
#define SYS_issetugid 253
#define SYS_lchown 254
#define SYS_aio_read 255
Modified: head/sys/sys/syscall.mk
==============================================================================
--- head/sys/sys/syscall.mk Thu Aug 18 10:54:21 2016 (r304401)
+++ head/sys/sys/syscall.mk Thu Aug 18 10:54:39 2016 (r304402)
@@ -1,7 +1,7 @@
# FreeBSD system call object files.
# DO NOT EDIT-- this file is automatically generated.
# $FreeBSD$
-# created from FreeBSD: head/sys/kern/syscalls.master 304176 2016-08-15 19:08:51Z kib
+# created from FreeBSD: head/sys/kern/syscalls.master 304395 2016-08-18 10:50:40Z gnn
MIASM = \
syscall.o \
exit.o \
@@ -163,7 +163,6 @@ MIASM = \
ntp_gettime.o \
minherit.o \
rfork.o \
- openbsd_poll.o \
issetugid.o \
lchown.o \
aio_read.o \
Modified: head/sys/sys/sysproto.h
==============================================================================
--- head/sys/sys/sysproto.h Thu Aug 18 10:54:21 2016 (r304401)
+++ head/sys/sys/sysproto.h Thu Aug 18 10:54:39 2016 (r304402)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/kern/syscalls.master 304176 2016-08-15 19:08:51Z kib
+ * created from FreeBSD: head/sys/kern/syscalls.master 304395 2016-08-18 10:50:40Z gnn
*/
#ifndef _SYS_SYSPROTO_H_
@@ -714,11 +714,6 @@ struct minherit_args {
struct rfork_args {
char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
};
-struct openbsd_poll_args {
- char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)];
- char nfds_l_[PADL_(u_int)]; u_int nfds; char nfds_r_[PADR_(u_int)];
- char timeout_l_[PADL_(int)]; int timeout; char timeout_r_[PADR_(int)];
-};
struct issetugid_args {
register_t dummy;
};
@@ -1946,7 +1941,6 @@ int sys_clock_getcpuclockid2(struct thre
int sys_ntp_gettime(struct thread *, struct ntp_gettime_args *);
int sys_minherit(struct thread *, struct minherit_args *);
int sys_rfork(struct thread *, struct rfork_args *);
-int sys_openbsd_poll(struct thread *, struct openbsd_poll_args *);
int sys_issetugid(struct thread *, struct issetugid_args *);
int sys_lchown(struct thread *, struct lchown_args *);
int sys_aio_read(struct thread *, struct aio_read_args *);
@@ -2717,7 +2711,6 @@ int freebsd10_pipe(struct thread *, stru
#define SYS_AUE_ntp_gettime AUE_NULL
#define SYS_AUE_minherit AUE_MINHERIT
#define SYS_AUE_rfork AUE_RFORK
-#define SYS_AUE_openbsd_poll AUE_POLL
#define SYS_AUE_issetugid AUE_ISSETUGID
#define SYS_AUE_lchown AUE_LCHOWN
#define SYS_AUE_aio_read AUE_NULL
More information about the svn-src-head
mailing list