From owner-svn-src-head@freebsd.org Sat May 19 07:31:36 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04C48EF2035; Sat, 19 May 2018 07:31:36 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A788F83D77; Sat, 19 May 2018 07:31:35 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88BEB24096; Sat, 19 May 2018 07:31:35 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4J7VZQd026914; Sat, 19 May 2018 07:31:35 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4J7VZRS026913; Sat, 19 May 2018 07:31:35 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201805190731.w4J7VZRS026913@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Sat, 19 May 2018 07:31:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333874 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 333874 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2018 07:31:36 -0000 Author: mmacy Date: Sat May 19 07:31:35 2018 New Revision: 333874 URL: https://svnweb.freebsd.org/changeset/base/333874 Log: Unbreak BeagleBone Black boot by collapsing 29 SYSINITs in to 1 Reported by: ilya at bakulin.de Modified: head/sys/kern/subr_capability.c Modified: head/sys/kern/subr_capability.c ============================================================================== --- head/sys/kern/subr_capability.c Sat May 19 07:04:43 2018 (r333873) +++ head/sys/kern/subr_capability.c Sat May 19 07:31:35 2018 (r333874) @@ -53,38 +53,73 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL #define assert(exp) KASSERT((exp), ("%s:%u", __func__, __LINE__)) +__read_mostly cap_rights_t cap_accept_rights; +__read_mostly cap_rights_t cap_bind_rights; +__read_mostly cap_rights_t cap_connect_rights; +__read_mostly cap_rights_t cap_event_rights; +__read_mostly cap_rights_t cap_fchdir_rights; +__read_mostly cap_rights_t cap_fcntl_rights; +__read_mostly cap_rights_t cap_fexecve_rights; +__read_mostly cap_rights_t cap_flock_rights; +__read_mostly cap_rights_t cap_fpathconf_rights; +__read_mostly cap_rights_t cap_fstat_rights; +__read_mostly cap_rights_t cap_ftruncate_rights; +__read_mostly cap_rights_t cap_getpeername_rights; +__read_mostly cap_rights_t cap_getsockopt_rights; +__read_mostly cap_rights_t cap_getsockname_rights; +__read_mostly cap_rights_t cap_ioctl_rights; +__read_mostly cap_rights_t cap_listen_rights; +__read_mostly cap_rights_t cap_mmap_rights; +__read_mostly cap_rights_t cap_no_rights; +__read_mostly cap_rights_t cap_fsync_rights; +__read_mostly cap_rights_t cap_pdgetpid_rights; +__read_mostly cap_rights_t cap_pdkill_rights; +__read_mostly cap_rights_t cap_pread_rights; +__read_mostly cap_rights_t cap_pwrite_rights; +__read_mostly cap_rights_t cap_read_rights; +__read_mostly cap_rights_t cap_recv_rights; +__read_mostly cap_rights_t cap_send_rights; +__read_mostly cap_rights_t cap_setsockopt_rights; +__read_mostly cap_rights_t cap_shutdown_rights; +__read_mostly cap_rights_t cap_write_rights; +__read_mostly cap_rights_t cap_no_rights; -CAP_RIGHTS_DEFINE1(cap_accept_rights, CAP_ACCEPT); -CAP_RIGHTS_DEFINE1(cap_bind_rights, CAP_BIND); -CAP_RIGHTS_DEFINE1(cap_connect_rights, CAP_CONNECT); -CAP_RIGHTS_DEFINE1(cap_event_rights, CAP_EVENT); -CAP_RIGHTS_DEFINE1(cap_fchdir_rights, CAP_FCHDIR); -CAP_RIGHTS_DEFINE1(cap_fcntl_rights, CAP_FCNTL); -CAP_RIGHTS_DEFINE1(cap_fexecve_rights, CAP_FEXECVE); -CAP_RIGHTS_DEFINE1(cap_flock_rights, CAP_FLOCK); -CAP_RIGHTS_DEFINE1(cap_fpathconf_rights, CAP_FPATHCONF); -CAP_RIGHTS_DEFINE1(cap_fstat_rights, CAP_FSTAT); -CAP_RIGHTS_DEFINE1(cap_fsync_rights, CAP_FSYNC); -CAP_RIGHTS_DEFINE1(cap_ftruncate_rights, CAP_FTRUNCATE); -CAP_RIGHTS_DEFINE1(cap_getpeername_rights, CAP_GETPEERNAME); -CAP_RIGHTS_DEFINE1(cap_getsockname_rights, CAP_GETSOCKNAME); -CAP_RIGHTS_DEFINE1(cap_getsockopt_rights, CAP_GETSOCKOPT); -CAP_RIGHTS_DEFINE1(cap_ioctl_rights, CAP_IOCTL); -CAP_RIGHTS_DEFINE1(cap_listen_rights, CAP_LISTEN); -CAP_RIGHTS_DEFINE1(cap_mmap_rights, CAP_MMAP); -CAP_RIGHTS_DEFINE1(cap_pdgetpid_rights, CAP_PDGETPID); -CAP_RIGHTS_DEFINE1(cap_pdkill_rights, CAP_PDKILL); -CAP_RIGHTS_DEFINE1(cap_pread_rights, CAP_PREAD); -CAP_RIGHTS_DEFINE1(cap_pwrite_rights, CAP_PWRITE); -CAP_RIGHTS_DEFINE1(cap_read_rights, CAP_READ); -CAP_RIGHTS_DEFINE1(cap_recv_rights, CAP_RECV); -CAP_RIGHTS_DEFINE1(cap_send_rights, CAP_SEND); -CAP_RIGHTS_DEFINE1(cap_setsockopt_rights, CAP_SETSOCKOPT); -CAP_RIGHTS_DEFINE1(cap_shutdown_rights, CAP_SHUTDOWN); -CAP_RIGHTS_DEFINE1(cap_write_rights, CAP_WRITE); +static void +__cap_rights_sysinit1(void *arg) +{ + cap_rights_init(&cap_accept_rights, CAP_ACCEPT); + cap_rights_init(&cap_bind_rights, CAP_BIND); + cap_rights_init(&cap_connect_rights, CAP_CONNECT); + cap_rights_init(&cap_event_rights, CAP_EVENT); + cap_rights_init(&cap_fchdir_rights, CAP_FCHDIR); + cap_rights_init(&cap_fcntl_rights, CAP_FCNTL); + cap_rights_init(&cap_fexecve_rights, CAP_FEXECVE); + cap_rights_init(&cap_flock_rights, CAP_FLOCK); + cap_rights_init(&cap_fpathconf_rights, CAP_FPATHCONF); + cap_rights_init(&cap_fstat_rights, CAP_FSTAT); + cap_rights_init(&cap_fsync_rights, CAP_FSYNC); + cap_rights_init(&cap_ftruncate_rights, CAP_FTRUNCATE); + cap_rights_init(&cap_getpeername_rights, CAP_GETPEERNAME); + cap_rights_init(&cap_getsockname_rights, CAP_GETSOCKNAME); + cap_rights_init(&cap_getsockopt_rights, CAP_GETSOCKOPT); + cap_rights_init(&cap_ioctl_rights, CAP_IOCTL); + cap_rights_init(&cap_listen_rights, CAP_LISTEN); + cap_rights_init(&cap_mmap_rights, CAP_MMAP); + cap_rights_init(&cap_pdgetpid_rights, CAP_PDGETPID); + cap_rights_init(&cap_pdkill_rights, CAP_PDKILL); + cap_rights_init(&cap_pread_rights, CAP_PREAD); + cap_rights_init(&cap_pwrite_rights, CAP_PWRITE); + cap_rights_init(&cap_read_rights, CAP_READ); + cap_rights_init(&cap_recv_rights, CAP_RECV); + cap_rights_init(&cap_send_rights, CAP_SEND); + cap_rights_init(&cap_setsockopt_rights, CAP_SETSOCKOPT); + cap_rights_init(&cap_shutdown_rights, CAP_SHUTDOWN); + cap_rights_init(&cap_write_rights, CAP_WRITE); + cap_rights_init(&cap_no_rights); +} +SYSINIT(cap_rights1_sysinit, SI_SUB_COPYRIGHT, SI_ORDER_ANY, \ + __cap_rights_sysinit1, NULL); -__read_mostly cap_rights_t cap_no_rights; -CAP_RIGHTS_SYSINIT0(cap_no_rights, cap_no_rights); #endif #define CAPARSIZE_MIN (CAP_RIGHTS_VERSION_00 + 2)