From owner-svn-src-all@freebsd.org  Thu May 24 23:47:28 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 3E2C8F6DA18;
 Thu, 24 May 2018 23:47:28 +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 BC03E69DE7;
 Thu, 24 May 2018 23:47:27 +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 98D1319216;
 Thu, 24 May 2018 23:47:27 +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 w4ONlRo2090123;
 Thu, 24 May 2018 23:47:27 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4ONlRA3090122;
 Thu, 24 May 2018 23:47:27 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201805242347.w4ONlRA3090122@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
 mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Thu, 24 May 2018 23:47:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334194 - head/sys/netipsec
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: head/sys/netipsec
X-SVN-Commit-Revision: 334194
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.26
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 May 2018 23:47:28 -0000

Author: mmacy
Date: Thu May 24 23:47:27 2018
New Revision: 334194
URL: https://svnweb.freebsd.org/changeset/base/334194

Log:
  netipsec/!VIMAGE: don't declare/define spdcache_destroy on non-VIMAGE builds
  this breaks MIPS compiles in universe

Modified:
  head/sys/netipsec/key.c

Modified: head/sys/netipsec/key.c
==============================================================================
--- head/sys/netipsec/key.c	Thu May 24 23:21:23 2018	(r334193)
+++ head/sys/netipsec/key.c	Thu May 24 23:47:27 2018	(r334194)
@@ -758,9 +758,10 @@ static struct spdcache_entry *spdcache_entry_alloc(
 	const struct secpolicyindex *spidx,
 	struct secpolicy *policy);
 static void spdcache_entry_free(struct spdcache_entry *entry);
+#ifdef VIMAGE
 static void spdcache_destroy(void);
+#endif
 
-
 #define	DBG_IPSEC_INITREF(t, p)	do {				\
 	refcount_init(&(p)->refcnt, 1);				\
 	KEYDBG(KEY_STAMP,					\
@@ -8282,6 +8283,7 @@ spdcache_clear(void)
 	}
 }
 
+#ifdef VIMAGE
 void
 spdcache_destroy(void)
 {
@@ -8297,7 +8299,7 @@ spdcache_destroy(void)
 		free(V_spdcache_lock, M_IPSEC_SPDCACHE);
 	}
 }
-
+#endif
 void
 key_init(void)
 {