From owner-svn-soc-all@freebsd.org  Sun Nov 29 16:04:59 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E9EF5A3B2D9
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Sun, 29 Nov 2015 16:04:59 +0000 (UTC) (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D9F4D19DC
 for <svn-soc-all@FreeBSD.org>; Sun, 29 Nov 2015 16:04:59 +0000 (UTC)
 (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id tATG4xWL048894
 for <svn-soc-all@FreeBSD.org>; Sun, 29 Nov 2015 16:04:59 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id tATG4xhN048890
 for svn-soc-all@FreeBSD.org; Sun, 29 Nov 2015 16:04:59 GMT
 (envelope-from def@FreeBSD.org)
Date: Sun, 29 Nov 2015 16:04:59 GMT
Message-Id: <201511291604.tATG4xhN048890@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 def@FreeBSD.org using -f
From: def@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r294537 - soc2013/def/crashdump-head/sys/kern
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Nov 2015 16:05:00 -0000

Author: def
Date: Sun Nov 29 16:04:58 2015
New Revision: 294537
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=294537

Log:
  Add ifdefs in order to compile kernel without EKCD.

Modified:
  soc2013/def/crashdump-head/sys/kern/kern_shutdown.c

Modified: soc2013/def/crashdump-head/sys/kern/kern_shutdown.c
==============================================================================
--- soc2013/def/crashdump-head/sys/kern/kern_shutdown.c	Sun Nov 29 14:44:40 2015	(r294536)
+++ soc2013/def/crashdump-head/sys/kern/kern_shutdown.c	Sun Nov 29 16:04:58 2015	(r294537)
@@ -157,7 +157,7 @@
 	uint32_t	kdc_encryptedkeysize;
 	uint8_t		kdc_encryptedkey[];
 };
-#endif /* EKCD */
+#endif
 
 /*
  * Variable panicstr contains argument to first call to panic; used as flag
@@ -897,9 +897,13 @@
 kerneldumpcrypto_dumpkeysize(const struct kerneldumpcrypto *kdc)
 {
 
+#ifdef EKCD
 	if (kdc == NULL)
 		return (0);
 	return (kdc->kdc_dumpkeysize);
+#else
+	return (0);
+#endif
 }
 
 /* Registration of dumpers */
@@ -916,7 +920,9 @@
 		return (error);
 
 	if (di == NULL) {
+#ifdef EKCD
 		free(dumper.kdc, M_EKCD);
+#endif
 		bzero(&dumper, sizeof dumper);
 		dumpdevname[0] = '\0';
 		return (0);
@@ -1026,7 +1032,7 @@
 
 	return (0);
 }
-#endif
+#endif /* EKCD */
 
 /* Call dumper with bounds checking. */
 static int
@@ -1065,6 +1071,7 @@
 	return (dump_raw_write(di, kdh, physical, offset, sizeof(*kdh)));
 }
 
+#ifdef EKCD
 int
 dump_write_key(struct dumperinfo *di, vm_offset_t physical, off_t offset)
 {
@@ -1092,6 +1099,15 @@
 	free(buf, M_EKCD);
 	return (ret);
 }
+#else /* !EKCD */
+int
+dump_write_key(struct dumperinfo *di __unused, vm_offset_t physical __unused,
+    off_t offset __unused)
+{
+
+	return (0);
+}
+#endif /* EKCD */
 
 void
 mkdumpheader(struct kerneldumpheader *kdh, char *magic, uint32_t archver,