From e5c39410099950fb012fb9323a29fbdef5beed4a Mon Sep 17 00:00:00 2001
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 17 Apr 2020 06:02:13 +0000
Subject: [PATCH] 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
---
 sys/rpc/rpc_prot.c | 2 --
 sys/xdr/xdr.c      | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/rpc/rpc_prot.c b/sys/rpc/rpc_prot.c
index 70a543d3f9c7..06a6349b1793 100644
--- a/sys/rpc/rpc_prot.c
+++ b/sys/rpc/rpc_prot.c
@@ -61,8 +61,6 @@ __FBSDID("$FreeBSD$");
 #include <rpc/clnt.h>
 #include <rpc/rpc_msg.h>
 
-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 *);
diff --git a/sys/xdr/xdr.c b/sys/xdr/xdr.c
index 915d27bc324b..6ebff3e6644e 100644
--- a/sys/xdr/xdr.c
+++ b/sys/xdr/xdr.c
@@ -65,6 +65,8 @@ typedef u_quad_t        u_longlong_t;   /* ANSI unsigned long long type */
 #define XDR_FALSE	((long) 0)
 #define XDR_TRUE	((long) 1)
 
+MALLOC_DEFINE(M_RPC, "rpc", "Remote Procedure Call");
+
 /*
  * for unit alignment
  */