Page MenuHomeFreeBSD
Files F133013903

D7548.id.diff
No OneTemporary
Actions

D7548.id.diff
View Options

Index: head/lib/libc/aarch64/sys/Makefile.inc
===================================================================
--- head/lib/libc/aarch64/sys/Makefile.inc
+++ head/lib/libc/aarch64/sys/Makefile.inc
@@ -15,7 +15,6 @@
NOASM= break.o \
exit.o \
getlogin.o \
- openbsd_poll.o \
sbrk.o \
sstk.o \
vfork.o \
Index: head/lib/libc/amd64/sys/Makefile.inc
===================================================================
--- head/lib/libc/amd64/sys/Makefile.inc
+++ head/lib/libc/amd64/sys/Makefile.inc
@@ -8,6 +8,6 @@
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
Index: head/lib/libc/arm/sys/Makefile.inc
===================================================================
--- head/lib/libc/arm/sys/Makefile.inc
+++ head/lib/libc/arm/sys/Makefile.inc
@@ -5,6 +5,6 @@
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
Index: head/lib/libc/i386/sys/Makefile.inc
===================================================================
--- head/lib/libc/i386/sys/Makefile.inc
+++ head/lib/libc/i386/sys/Makefile.inc
@@ -11,7 +11,7 @@
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
Index: head/lib/libc/mips/sys/Makefile.inc
===================================================================
--- head/lib/libc/mips/sys/Makefile.inc
+++ head/lib/libc/mips/sys/Makefile.inc
@@ -6,6 +6,6 @@
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
Index: head/lib/libc/powerpc/sys/Makefile.inc
===================================================================
--- head/lib/libc/powerpc/sys/Makefile.inc
+++ head/lib/libc/powerpc/sys/Makefile.inc
@@ -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
Index: head/lib/libc/powerpc64/sys/Makefile.inc
===================================================================
--- head/lib/libc/powerpc64/sys/Makefile.inc
+++ head/lib/libc/powerpc64/sys/Makefile.inc
@@ -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
Index: head/lib/libc/riscv/sys/Makefile.inc
===================================================================
--- head/lib/libc/riscv/sys/Makefile.inc
+++ head/lib/libc/riscv/sys/Makefile.inc
@@ -13,7 +13,6 @@
NOASM= break.o \
exit.o \
getlogin.o \
- openbsd_poll.o \
sbrk.o \
sstk.o \
vfork.o \
Index: head/lib/libc/sparc64/sys/Makefile.inc
===================================================================
--- head/lib/libc/sparc64/sys/Makefile.inc
+++ head/lib/libc/sparc64/sys/Makefile.inc
@@ -15,6 +15,6 @@
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
Index: head/sys/compat/freebsd32/syscalls.master
===================================================================
--- head/sys/compat/freebsd32/syscalls.master
+++ head/sys/compat/freebsd32/syscalls.master
@@ -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( \
Index: head/sys/kern/capabilities.conf
===================================================================
--- head/sys/kern/capabilities.conf
+++ head/sys/kern/capabilities.conf
@@ -463,14 +463,6 @@
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
Index: head/sys/kern/sys_generic.c
===================================================================
--- head/sys/kern/sys_generic.c
+++ head/sys/kern/sys_generic.c
@@ -1608,26 +1608,6 @@
}
/*
- * 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
Index: head/sys/kern/syscalls.master
===================================================================
--- head/sys/kern/syscalls.master
+++ head/sys/kern/syscalls.master
@@ -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); }
Index: head/sys/sys/param.h
===================================================================
--- head/sys/sys/param.h
+++ head/sys/sys/param.h
@@ -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,

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 23, 1:58 AM (9 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24078022
Default Alt Text
D7548.id.diff (6 KB)

Event Timeline