From owner-svn-src-all@FreeBSD.ORG  Tue Sep 18 18:16:53 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 90C321065679;
	Tue, 18 Sep 2012 18:16:53 +0000 (UTC)
	(envelope-from jimharris@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 790468FC14;
	Tue, 18 Sep 2012 18:16:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8IIGrBT038931;
	Tue, 18 Sep 2012 18:16:53 GMT
	(envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8IIGrSc038928;
	Tue, 18 Sep 2012 18:16:53 GMT
	(envelope-from jimharris@svn.freebsd.org)
Message-Id: <201209181816.q8IIGrSc038928@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Tue, 18 Sep 2012 18:16:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240671 - head/sys/dev/nvme
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Sep 2012 18:16:53 -0000

Author: jimharris
Date: Tue Sep 18 18:16:52 2012
New Revision: 240671
URL: http://svn.freebsd.org/changeset/base/240671

Log:
  Add __aligned(4) to NVMe defined data structures.
  
  This fixes issue in nvmecontrol(8), where clang throws a cast-align
  warning when casting a __packed structure pointer to a uint32_t
  pointer as part of printing raw hex output.
  
  Reported by: dhw

Modified:
  head/sys/dev/nvme/nvme.h

Modified: head/sys/dev/nvme/nvme.h
==============================================================================
--- head/sys/dev/nvme/nvme.h	Tue Sep 18 17:30:08 2012	(r240670)
+++ head/sys/dev/nvme/nvme.h	Tue Sep 18 18:16:52 2012	(r240671)
@@ -513,7 +513,7 @@ struct nvme_controller_data {
 
 	/* bytes 3072-4095: vendor specific */
 	uint8_t			reserved7[1024];
-} __packed;
+} __packed __aligned(4);
 
 struct nvme_namespace_data {
 
@@ -603,7 +603,7 @@ struct nvme_namespace_data {
 	uint8_t			reserved6[192];
 
 	uint8_t			vendor_specific[3712];
-};
+} __packed __aligned(4);
 
 enum nvme_log_page {
 
@@ -661,7 +661,7 @@ struct nvme_health_information_page {
 	uint64_t		num_error_info_log_entries[2];
 
 	uint8_t			reserved2[320];
-} __packed;
+} __packed __aligned(4);
 
 #define NVME_TEST_MAX_THREADS	128