mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-10-14 20:30:52 +08:00
Update to FreeBSD head 2018-06-01
Git mirror commit fb63610a69b0eb7f69a201ba05c4c1a7a2739cf9. Update #3472.
This commit is contained in:
@@ -33,7 +33,6 @@
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <rtems/bsd/local/opt_compat.h>
|
||||
#include <rtems/bsd/local/opt_ktrace.h>
|
||||
#include <rtems/bsd/local/opt_kqueue.h>
|
||||
|
||||
@@ -791,7 +790,7 @@ static void
|
||||
filt_timerdetach(struct knote *kn)
|
||||
{
|
||||
struct kq_timer_cb_data *kc;
|
||||
unsigned int old;
|
||||
unsigned int old __unused;
|
||||
|
||||
kc = kn->kn_ptr.p_v;
|
||||
callout_drain(&kc->c);
|
||||
@@ -1409,7 +1408,6 @@ kqueue_register(struct kqueue *kq, struct kevent *kev, struct thread *td, int wa
|
||||
struct file *fp;
|
||||
struct knote *kn, *tkn;
|
||||
struct knlist *knl;
|
||||
cap_rights_t rights;
|
||||
int error, filt, event;
|
||||
int haskqglobal, filedesc_unlock;
|
||||
|
||||
@@ -1445,8 +1443,7 @@ findkn:
|
||||
if (kev->ident > INT_MAX)
|
||||
error = EBADF;
|
||||
else
|
||||
error = fget(td, kev->ident,
|
||||
cap_rights_init(&rights, CAP_EVENT), &fp);
|
||||
error = fget(td, kev->ident, &cap_event_rights, &fp);
|
||||
if (error)
|
||||
goto done;
|
||||
|
||||
|
Reference in New Issue
Block a user