From owner-svn-src-all@freebsd.org Fri Apr 17 06:02:14 2020 Return-Path: Delivered-To: svn-src-all@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 457AC2AB359; Fri, 17 Apr 2020 06:02:14 +0000 (UTC) (envelope-from glebius@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 493QTy16ngz4cDv; Fri, 17 Apr 2020 06:02:14 +0000 (UTC) (envelope-from glebius@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 218A51DBF8; Fri, 17 Apr 2020 06:02:14 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03H62El4066779; Fri, 17 Apr 2020 06:02:14 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03H62D0n066777; Fri, 17 Apr 2020 06:02:13 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <202004170602.03H62D0n066777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 17 Apr 2020 06:02:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r360035 - in head/sys: rpc xdr X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: in head/sys: rpc xdr X-SVN-Commit-Revision: 360035 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2020 06:02:14 -0000 Author: glebius Date: Fri Apr 17 06:02:13 2020 New Revision: 360035 URL: https://svnweb.freebsd.org/changeset/base/360035 Log: Move M_RPC malloc type into XDR. Both RPC and XDR libraries use this type, but since RPC depends on XDR (not vice versa) we need it defined in XDR to make the module loadable without RPC. Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D24408 Modified: head/sys/rpc/rpc_prot.c head/sys/xdr/xdr.c Modified: head/sys/rpc/rpc_prot.c ============================================================================== --- head/sys/rpc/rpc_prot.c Fri Apr 17 05:59:38 2020 (r360034) +++ head/sys/rpc/rpc_prot.c Fri Apr 17 06:02:13 2020 (r360035) @@ -61,8 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include -MALLOC_DEFINE(M_RPC, "rpc", "Remote Procedure Call"); - #define assert(exp) KASSERT(exp, ("bad arguments")) static enum clnt_stat accepted(enum accept_stat, struct rpc_err *); Modified: head/sys/xdr/xdr.c ============================================================================== --- head/sys/xdr/xdr.c Fri Apr 17 05:59:38 2020 (r360034) +++ head/sys/xdr/xdr.c Fri Apr 17 06:02:13 2020 (r360035) @@ -65,6 +65,8 @@ typedef u_quad_t u_longlong_t; /* ANSI unsign #define XDR_FALSE ((long) 0) #define XDR_TRUE ((long) 1) +MALLOC_DEFINE(M_RPC, "rpc", "Remote Procedure Call"); + /* * for unit alignment */