From owner-svn-src-stable-12@freebsd.org Thu Apr 2 15:35:47 2020 Return-Path: Delivered-To: svn-src-stable-12@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 4AFBB2A82B7; Thu, 2 Apr 2020 15:35:47 +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 48tRwb50dyz4p4w; Thu, 2 Apr 2020 15:35:43 +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 7390A1B4D9; Thu, 2 Apr 2020 15:30:31 +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 032FUVpL071233; Thu, 2 Apr 2020 15:30:31 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 032FUVvg071231; Thu, 2 Apr 2020 15:30:31 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202004021530.032FUVvg071231@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 2 Apr 2020 15:30:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359564 - in stable/12/sys: kern sys X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12/sys: kern sys X-SVN-Commit-Revision: 359564 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Apr 2020 15:35:47 -0000 Author: markj Date: Thu Apr 2 15:30:30 2020 New Revision: 359564 URL: https://svnweb.freebsd.org/changeset/base/359564 Log: MFC r359330: Remove unused SYSINIT macros for capability rights. Modified: stable/12/sys/kern/subr_capability.c stable/12/sys/sys/capsicum.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/subr_capability.c ============================================================================== --- stable/12/sys/kern/subr_capability.c Thu Apr 2 15:17:53 2020 (r359563) +++ stable/12/sys/kern/subr_capability.c Thu Apr 2 15:30:30 2020 (r359564) @@ -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(&cap_accept_rights, CAP_ACCEPT); cap_rights_init(&cap_bind_rights, CAP_BIND); @@ -149,8 +149,8 @@ __cap_rights_sysinit1(void *arg) 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); +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: stable/12/sys/sys/capsicum.h ============================================================================== --- stable/12/sys/sys/capsicum.h Thu Apr 2 15:17:53 2020 (r359563) +++ stable/12/sys/sys/capsicum.h Thu Apr 2 15:30:30 2020 (r359564) @@ -343,66 +343,8 @@ 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); bool cap_rights_contains(const cap_rights_t *big, const cap_rights_t *little); -void __cap_rights_sysinit(void *arg); __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