From owner-svn-soc-all@freebsd.org Mon Nov 30 22:00:03 2015 Return-Path: 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 A1034A3DF03 for ; Mon, 30 Nov 2015 22:00:03 +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 92BA11CFE for ; Mon, 30 Nov 2015 22:00:03 +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 tAUM030O024836 for ; Mon, 30 Nov 2015 22:00:03 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id tAUM029A024741 for svn-soc-all@FreeBSD.org; Mon, 30 Nov 2015 22:00:02 GMT (envelope-from def@FreeBSD.org) Date: Mon, 30 Nov 2015 22:00:02 GMT Message-Id: <201511302200.tAUM029A024741@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: r294585 - soc2013/def/crashdump-head/sys/sys 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2015 22:00:03 -0000 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_ */