Author: gnn Date: Thu Aug 18 10:50:40 2016 New Revision: 304395 URL: https://svnweb.freebsd.org/changeset/base/304395
Log: Remove unusedd and obsolete openbsd_poll system call. (Phase 1) Reported by: brooks Reviewed by: brooks,jhb Differential Revision: https://reviews.freebsd.org/D7548 Modified: head/lib/libc/aarch64/sys/Makefile.inc head/lib/libc/amd64/sys/Makefile.inc head/lib/libc/arm/sys/Makefile.inc head/lib/libc/i386/sys/Makefile.inc head/lib/libc/mips/sys/Makefile.inc head/lib/libc/powerpc/sys/Makefile.inc head/lib/libc/powerpc64/sys/Makefile.inc head/lib/libc/riscv/sys/Makefile.inc head/lib/libc/sparc64/sys/Makefile.inc head/sys/compat/freebsd32/syscalls.master head/sys/kern/capabilities.conf head/sys/kern/sys_generic.c head/sys/kern/syscalls.master head/sys/sys/param.h Modified: head/lib/libc/aarch64/sys/Makefile.inc ============================================================================== --- head/lib/libc/aarch64/sys/Makefile.inc Thu Aug 18 10:50:27 2016 (r304394) +++ head/lib/libc/aarch64/sys/Makefile.inc Thu Aug 18 10:50:40 2016 (r304395) @@ -15,7 +15,6 @@ MDASM= cerror.S \ NOASM= break.o \ exit.o \ getlogin.o \ - openbsd_poll.o \ sbrk.o \ sstk.o \ vfork.o \ Modified: head/lib/libc/amd64/sys/Makefile.inc ============================================================================== --- head/lib/libc/amd64/sys/Makefile.inc Thu Aug 18 10:50:27 2016 (r304394) +++ head/lib/libc/amd64/sys/Makefile.inc Thu Aug 18 10:50:40 2016 (r304395) @@ -8,6 +8,6 @@ MDASM= vfork.S brk.S cerror.S exect.S ge sbrk.S setlogin.S sigreturn.S # Don't generate default code for these syscalls: -NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o +NOASM= break.o exit.o getlogin.o sstk.o vfork.o yield.o PSEUDO= _getlogin.o _exit.o Modified: head/lib/libc/arm/sys/Makefile.inc ============================================================================== --- head/lib/libc/arm/sys/Makefile.inc Thu Aug 18 10:50:27 2016 (r304394) +++ head/lib/libc/arm/sys/Makefile.inc Thu Aug 18 10:50:40 2016 (r304395) @@ -5,6 +5,6 @@ SRCS+= __vdso_gettc.c MDASM= Ovfork.S brk.S cerror.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S # Don't generate default code for these syscalls: -NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o +NOASM= break.o exit.o getlogin.o sstk.o vfork.o yield.o PSEUDO= _exit.o _getlogin.o Modified: head/lib/libc/i386/sys/Makefile.inc ============================================================================== --- head/lib/libc/i386/sys/Makefile.inc Thu Aug 18 10:50:27 2016 (r304394) +++ head/lib/libc/i386/sys/Makefile.inc Thu Aug 18 10:50:40 2016 (r304395) @@ -11,7 +11,7 @@ MDASM= Ovfork.S brk.S cerror.S exect.S g sbrk.S setlogin.S sigreturn.S syscall.S # Don't generate default code for these syscalls: -NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o +NOASM= break.o exit.o getlogin.o sstk.o vfork.o yield.o PSEUDO= _getlogin.o _exit.o Modified: head/lib/libc/mips/sys/Makefile.inc ============================================================================== --- head/lib/libc/mips/sys/Makefile.inc Thu Aug 18 10:50:27 2016 (r304394) +++ head/lib/libc/mips/sys/Makefile.inc Thu Aug 18 10:50:40 2016 (r304395) @@ -6,6 +6,6 @@ MDASM= Ovfork.S brk.S cerror.S exect.S ptrace.S sbrk.S syscall.S # Don't generate default code for these syscalls: -NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o +NOASM= break.o exit.o getlogin.o sstk.o vfork.o yield.o PSEUDO= _exit.o _getlogin.o Modified: head/lib/libc/powerpc/sys/Makefile.inc ============================================================================== --- head/lib/libc/powerpc/sys/Makefile.inc Thu Aug 18 10:50:27 2016 (r304394) +++ head/lib/libc/powerpc/sys/Makefile.inc Thu Aug 18 10:50:40 2016 (r304395) @@ -3,6 +3,6 @@ MDASM+= brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S # Don't generate default code for these syscalls: -NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o +NOASM= break.o exit.o getlogin.o sstk.o yield.o PSEUDO= _getlogin.o _exit.o Modified: head/lib/libc/powerpc64/sys/Makefile.inc ============================================================================== --- head/lib/libc/powerpc64/sys/Makefile.inc Thu Aug 18 10:50:27 2016 (r304394) +++ head/lib/libc/powerpc64/sys/Makefile.inc Thu Aug 18 10:50:40 2016 (r304395) @@ -3,6 +3,6 @@ MDASM+= brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S # Don't generate default code for these syscalls: -NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o +NOASM= break.o exit.o getlogin.o sstk.o yield.o PSEUDO= _getlogin.o _exit.o Modified: head/lib/libc/riscv/sys/Makefile.inc ============================================================================== --- head/lib/libc/riscv/sys/Makefile.inc Thu Aug 18 10:50:27 2016 (r304394) +++ head/lib/libc/riscv/sys/Makefile.inc Thu Aug 18 10:50:40 2016 (r304395) @@ -13,7 +13,6 @@ MDASM= cerror.S \ NOASM= break.o \ exit.o \ getlogin.o \ - openbsd_poll.o \ sbrk.o \ sstk.o \ vfork.o \ Modified: head/lib/libc/sparc64/sys/Makefile.inc ============================================================================== --- head/lib/libc/sparc64/sys/Makefile.inc Thu Aug 18 10:50:27 2016 (r304394) +++ head/lib/libc/sparc64/sys/Makefile.inc Thu Aug 18 10:50:40 2016 (r304395) @@ -15,6 +15,6 @@ CFLAGS+= -I${LIBC_SRCTOP}/sparc64/fpu MDASM+= brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S sigaction1.S # Don't generate default code for these syscalls: -NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o +NOASM= break.o exit.o getlogin.o sstk.o yield.o PSEUDO= _getlogin.o _exit.o Modified: head/sys/compat/freebsd32/syscalls.master ============================================================================== --- head/sys/compat/freebsd32/syscalls.master Thu Aug 18 10:50:27 2016 (r304394) +++ head/sys/compat/freebsd32/syscalls.master Thu Aug 18 10:50:40 2016 (r304395) @@ -474,8 +474,7 @@ 250 AUE_MINHERIT NOPROTO { int minherit(void *addr, size_t len, \ int inherit); } 251 AUE_RFORK NOPROTO { int rfork(int flags); } -252 AUE_POLL NOPROTO { int openbsd_poll(struct pollfd *fds, \ - u_int nfds, int timeout); } +252 AUE_NULL OBSOL openbsd_poll 253 AUE_ISSETUGID NOPROTO { int issetugid(void); } 254 AUE_LCHOWN NOPROTO { int lchown(char *path, int uid, int gid); } 255 AUE_NULL STD { int freebsd32_aio_read( \ Modified: head/sys/kern/capabilities.conf ============================================================================== --- head/sys/kern/capabilities.conf Thu Aug 18 10:50:27 2016 (r304394) +++ head/sys/kern/capabilities.conf Thu Aug 18 10:50:40 2016 (r304395) @@ -463,14 +463,6 @@ utimensat open ## -## Allow poll(2), which will be scoped by capability rights. -## -## XXXRW: Perhaps we don't need the OpenBSD version? -## XXXRW: We don't yet do that scoping. -## -openbsd_poll - -## ## Process descriptor-related system calls are allowed. ## pdfork Modified: head/sys/kern/sys_generic.c ============================================================================== --- head/sys/kern/sys_generic.c Thu Aug 18 10:50:27 2016 (r304394) +++ head/sys/kern/sys_generic.c Thu Aug 18 10:50:40 2016 (r304395) @@ -1608,26 +1608,6 @@ pollscan(td, fds, nfd) } /* - * OpenBSD poll system call. - * - * XXX this isn't quite a true representation.. OpenBSD uses select ops. - */ -#ifndef _SYS_SYSPROTO_H_ -struct openbsd_poll_args { - struct pollfd *fds; - u_int nfds; - int timeout; -}; -#endif -int -sys_openbsd_poll(td, uap) - register struct thread *td; - register struct openbsd_poll_args *uap; -{ - return (sys_poll(td, (struct poll_args *)uap)); -} - -/* * XXX This was created specifically to support netncp and netsmb. This * allows the caller to specify a socket to wait for events on. It returns * 0 if any events matched and an error otherwise. There is no way to Modified: head/sys/kern/syscalls.master ============================================================================== --- head/sys/kern/syscalls.master Thu Aug 18 10:50:27 2016 (r304394) +++ head/sys/kern/syscalls.master Thu Aug 18 10:50:40 2016 (r304395) @@ -472,8 +472,7 @@ 250 AUE_MINHERIT STD { int minherit(void *addr, size_t len, \ int inherit); } 251 AUE_RFORK STD { int rfork(int flags); } -252 AUE_POLL STD { int openbsd_poll(struct pollfd *fds, \ - u_int nfds, int timeout); } +252 AUE_NULL OBSOL openbsd_poll 253 AUE_ISSETUGID STD { int issetugid(void); } 254 AUE_LCHOWN STD { int lchown(char *path, int uid, int gid); } 255 AUE_NULL STD { int aio_read(struct aiocb *aiocbp); } Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Thu Aug 18 10:50:27 2016 (r304394) +++ head/sys/sys/param.h Thu Aug 18 10:50:40 2016 (r304395) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1200001 /* Master, propagated to newvers */ +#define __FreeBSD_version 1200002 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
