From owner-svn-src-stable@FreeBSD.ORG  Fri Jul  9 20:43:59 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F136106566C;
	Fri,  9 Jul 2010 20:43:59 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D5758FC0A;
	Fri,  9 Jul 2010 20:43:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o69KhvZ0043623;
	Fri, 9 Jul 2010 20:43:57 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o69Khvbc043622;
	Fri, 9 Jul 2010 20:43:57 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201007092043.o69Khvbc043622@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 9 Jul 2010 20:43:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209863 - stable/7/sys/dev/twa
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jul 2010 20:43:59 -0000

Author: delphij
Date: Fri Jul  9 20:43:57 2010
New Revision: 209863
URL: http://svn.freebsd.org/changeset/base/209863

Log:
  MFC r209860:
  
  Don't use pack() for structures that is used purely for software state.
  Otherwise the resulting, unaligned mutex structure would trigger panic.
  
  Submitted by:		Tom Cough <tom.couch lsi.com>
  Reported/Tested by:	jhb
  PR:			kern/148464

Modified:
  stable/7/sys/dev/twa/tw_cl.h
  stable/7/sys/dev/twa/tw_cl_share.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/twa/tw_cl.h
==============================================================================
--- stable/7/sys/dev/twa/tw_cl.h	Fri Jul  9 20:05:56 2010	(r209862)
+++ stable/7/sys/dev/twa/tw_cl.h	Fri Jul  9 20:43:57 2010	(r209863)
@@ -74,7 +74,6 @@
 #define TW_CLI_PCI_CONFIG_STATUS_OFFSET		0x6 /* status register offset */
 #endif /* TW_OSL_PCI_CONFIG_ACCESSIBLE */
 
-#pragma pack(1)
 
 #ifdef TW_OSL_DEBUG
 struct tw_cli_q_stats {
@@ -206,7 +205,6 @@ struct tw_cli_ctlr_context {
 #endif /* TW_OSL_DEBUG */
 };
 
-#pragma pack()
 
 
 /*

Modified: stable/7/sys/dev/twa/tw_cl_share.h
==============================================================================
--- stable/7/sys/dev/twa/tw_cl_share.h	Fri Jul  9 20:05:56 2010	(r209862)
+++ stable/7/sys/dev/twa/tw_cl_share.h	Fri Jul  9 20:43:57 2010	(r209863)
@@ -125,7 +125,6 @@
 #define TW_CL_SEVERITY_DEBUG_STRING	"DEBUG"
 
 
-#pragma pack(1)
 
 /*
  * Structure, a pointer to which is used as the controller handle in
@@ -190,6 +189,7 @@ struct tw_cl_req_packet {
 };
 
 
+#pragma pack(1)
 /*
  * Packet that describes an AEN/error generated by the controller,
  * Common Layer, or even the OS Layer.
@@ -206,6 +206,7 @@ struct tw_cl_event_packet {
 	TW_UINT32	event_src;
 	TW_UINT8	severity_str[20];
 };
+#pragma pack()
 
 
 /* Structure to link 2 adjacent elements in a list. */
@@ -215,6 +216,7 @@ struct tw_cl_link {
 };
 
 
+#pragma pack(1)
 /* Scatter/Gather list entry with 32 bit addresses. */
 struct tw_cl_sg_desc32 {
 	TW_UINT32	address;