socsvn commit: r294585 - soc2013/def/crashdump-head/sys/sys

[def at FreeBSD.org]

Author: def
Date: Mon Nov 30 22:00:02 2015
New Revision: 294585
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=294585

Log:
  Replace old DIOCSKERNELDUMP I/O control with a new one.

Modified:
  soc2013/def/crashdump-head/sys/sys/disk.h

Modified: soc2013/def/crashdump-head/sys/sys/disk.h
==============================================================================
--- soc2013/def/crashdump-head/sys/sys/disk.h	Mon Nov 30 21:16:26 2015	(r294584)
+++ soc2013/def/crashdump-head/sys/sys/disk.h	Mon Nov 30 22:00:02 2015	(r294585)
@@ -54,19 +54,7 @@
 	 * disk label formats.  Don't use it unless you have to.
 	 */
 
-struct diocskerneldump_arg {
-	uint8_t		 kda_enable;
-	uint8_t		 kda_encrypt;
-	uint8_t		 kda_key[KERNELDUMP_KEY_SIZE];
-	uint32_t	 kda_encryptedkeysize;
-	uint8_t		*kda_encryptedkey;
-};
-#define	DIOCSEKCD _IOW('d', 132, struct diocskerneldump_arg)
-	/*
-	 * Enable/Disable the device for kernel core dumps.
-	 */
-
-#define	DIOCSKERNELDUMP _IOW('d', 133, u_int)	/* Set/Clear kernel dumps */
+#define	DIOCSKERNELDUMPOLD _IOW('d', 133, u_int) /* Set/Clear kernel dumps */
 	/*
 	 * Enable/Disable (the argument is boolean) the device for kernel
 	 * core dumps.
@@ -149,4 +137,16 @@
 };
 #define	DIOCGATTR _IOWR('d', 142, struct diocgattr_arg)
 
+struct diocskerneldump_arg {
+	uint8_t		 kda_enable;
+	uint8_t		 kda_encryption;
+	uint8_t		 kda_key[KERNELDUMP_KEY_MAX_SIZE];
+	uint32_t	 kda_encryptedkeysize;
+	uint8_t		*kda_encryptedkey;
+};
+#define	DIOCSKERNELDUMP _IOW('d', 132, struct diocskerneldump_arg)
+	/*
+	 * Enable/Disable the device for kernel core dumps.
+	 */
+
 #endif /* _SYS_DISK_H_ */