From owner-svn-src-head@freebsd.org Thu Mar 26 15:02:46 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 25BA82A2348; Thu, 26 Mar 2020 15:02:46 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48p7Wn0Bvkz4CGQ; Thu, 26 Mar 2020 15:02:45 +0000 (UTC) (envelope-from markj@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 312A3803A; Thu, 26 Mar 2020 15:02:38 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02QF2bVN024074; Thu, 26 Mar 2020 15:02:37 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02QF2b1U024072; Thu, 26 Mar 2020 15:02:37 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202003261502.02QF2b1U024072@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 26 Mar 2020 15:02:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359330 - in head/sys: kern sys X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head/sys: kern sys X-SVN-Commit-Revision: 359330 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.29 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: Thu, 26 Mar 2020 15:02:46 -0000 Author: markj Date: Thu Mar 26 15:02:37 2020 New Revision: 359330 URL: https://svnweb.freebsd.org/changeset/base/359330 Log: Remove unused SYSINIT macros for capability rights. Static rights are initialized in cap_rights_sysinit(). MFC after: 1 week Modified: head/sys/kern/subr_capability.c head/sys/sys/capsicum.h Modified: head/sys/kern/subr_capability.c ============================================================================== --- head/sys/kern/subr_capability.c Thu Mar 26 12:17:49 2020 (r359329) +++ head/sys/kern/subr_capability.c Thu Mar 26 15:02:37 2020 (r359330) @@ -101,7 +101,7 @@ __read_mostly cap_rights_t cap_write_rights; __read_mostly cap_rights_t cap_no_rights; static void -__cap_rights_sysinit1(void *arg) +cap_rights_sysinit(void *arg) { cap_rights_init_one(&cap_accept_rights, CAP_ACCEPT); cap_rights_init_one(&cap_bind_rights, CAP_BIND); @@ -149,8 +149,8 @@ __cap_rights_sysinit1(void *arg) cap_rights_init_one(&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); +SYSINIT(cap_rights_sysinit, SI_SUB_COPYRIGHT, SI_ORDER_ANY, cap_rights_sysinit, + NULL); #endif @@ -246,16 +246,6 @@ cap_rights_is_vset(const cap_rights_t *rights, va_list } return (true); -} - -void -__cap_rights_sysinit(void *arg) -{ - struct cap_rights_init_args *cria = arg; - cap_rights_t *rights = cria->cria_rights; - - __cap_rights_init(CAP_RIGHTS_VERSION, rights, cria->cria_value1, - cria->cria_value2, cria->cria_value3, cria->cria_value4, 0ULL); } cap_rights_t * Modified: head/sys/sys/capsicum.h ============================================================================== --- head/sys/sys/capsicum.h Thu Mar 26 12:17:49 2020 (r359329) +++ head/sys/sys/capsicum.h Thu Mar 26 15:02:37 2020 (r359330) @@ -342,7 +342,6 @@ bool __cap_rights_is_set(const cap_rights_t *rights, . bool cap_rights_is_valid(const cap_rights_t *rights); cap_rights_t *cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src); cap_rights_t *cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src); -void __cap_rights_sysinit(void *arg); #ifdef _KERNEL /* @@ -416,63 +415,6 @@ bool cap_rights_contains(const cap_rights_t *big, cons #endif __END_DECLS -struct cap_rights_init_args { - cap_rights_t *cria_rights; - uint64_t cria_value1; - uint64_t cria_value2; - uint64_t cria_value3; - uint64_t cria_value4; - uint64_t cria_value5; -}; - -#define CAP_RIGHTS_SYSINIT0(name, rights) \ - static struct cap_rights_init_args name##_args = { \ - &(rights) \ - }; \ - SYSINIT(name##_cap_rights_sysinit, SI_SUB_COPYRIGHT+1, SI_ORDER_ANY, \ - __cap_rights_sysinit, &name##_args); - -#define CAP_RIGHTS_SYSINIT1(name, rights, value1) \ - static struct cap_rights_init_args name##_args = { \ - &(rights), \ - (value1) \ - }; \ - SYSINIT(name##_cap_rights_sysinit, SI_SUB_COPYRIGHT+1, SI_ORDER_ANY, \ - __cap_rights_sysinit, &name##_args); - -#define CAP_RIGHTS_SYSINIT2(name, rights, value1, value2) \ - static struct cap_rights_init_args name##_args = { \ - &(rights), \ - (value1), \ - (value2) \ - }; \ - SYSINIT(name##_cap_rights_sysinit, SI_SUB_COPYRIGHT, SI_ORDER_ANY, \ - __cap_rights_sysinit, &name##_args); - -#define CAP_RIGHTS_SYSINIT3(name, rights, value1, value2, value3) \ - static struct cap_rights_init_args name##_args = { \ - &(rights), \ - (value1), \ - (value2), \ - (value3) \ - }; \ - SYSINIT(name##_cap_rights_sysinit, SI_SUB_COPYRIGHT, SI_ORDER_ANY, \ - __cap_rights_sysinit, &name##_args); - -#define CAP_RIGHTS_SYSINIT4(name, rights, value1, value2, value3, value4) \ - static struct cap_rights_init_args name##_args = { \ - &(rights), \ - (value1), \ - (value2), \ - (value3), \ - (value4) \ - }; \ - SYSINIT(name##_cap_rights_sysinit, SI_SUB_COPYRIGHT, SI_ORDER_ANY, \ - __cap_rights_sysinit, &name##_args); - -#define CAP_RIGHTS_DEFINE1(name, value) \ - __read_mostly cap_rights_t name; \ - CAP_RIGHTS_SYSINIT1(name, name, value); #ifdef _KERNEL