socsvn commit: r286796 - soc2013/def/crashdump-head/sys/kern

[def at FreeBSD.org]

Author: def
Date: Sun Jun  7 17:12:19 2015
New Revision: 286796
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=286796

Log:
  Add missing EKCD scope.

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 Jun  7 16:23:14 2015	(r286795)
+++ soc2013/def/crashdump-head/sys/kern/kern_shutdown.c	Sun Jun  7 17:12:19 2015	(r286796)
@@ -139,6 +139,7 @@
 SYSCTL_INT(_kern_shutdown, OID_AUTO, show_busybufs, CTLFLAG_RW,
 	&show_busybufs, 0, "");
 
+#ifdef EKCD
 MALLOC_DEFINE(M_KDK, "kerneldumpkey", "Kernel dump key structure");
 
 static struct kerneldumpcrypto {
@@ -154,7 +155,6 @@
 
 static struct kerneldumpkey *dumpkey;
 
-#ifdef EKCD
 static int kerneldump_sysctl_keymaterial(SYSCTL_HANDLER_ARGS);
 static int kerneldump_sysctl_encryptedkey(SYSCTL_HANDLER_ARGS);
 
@@ -967,6 +967,8 @@
 	if (dumper.dumper != NULL)
 		return (EBUSY);
 	dumper = *di;
+	dumper.kdc = NULL;
+	dumper.kdk = NULL;
 
 #ifdef EKCD
 	error = kerneldump_crypto_init(&dumper, &dumpcrypto, dumpkey);
@@ -982,6 +984,7 @@
 	return (0);
 }
 
+#ifdef EKCD
 /* Encrypt data and call dumper. */
 static int
 dump_encrypted_write(struct dumperinfo *di, void *virtual, vm_offset_t physical,
@@ -1032,6 +1035,7 @@
 
 	return (0);
 }
+#endif
 
 static int
 dump_check_bounds(struct dumperinfo *di, off_t offset, size_t length)
@@ -1084,8 +1088,10 @@
 	if (error != 0)
 		return (error);
 
+#ifdef EKCD
 	if (di->kdc->kdc_enable == 1)
 		di->kdc->kdc_offset = offset + sizeof(*kdh);
+#endif
 
 	return (0);
 }
@@ -1105,8 +1111,10 @@
 	if (error != 0)
 		return (error);
 
+#ifdef EKCD
 	if (di->kdc->kdc_enable == 1)
 		di->kdc->kdc_offset = offset + kerneldumpkey_size(kdk);
+#endif
 
 	return (0);
 }