From owner-svn-src-all@FreeBSD.ORG  Mon Apr 25 14:10:33 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D1965106564A;
	Mon, 25 Apr 2011 14:10:33 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C25168FC08;
	Mon, 25 Apr 2011 14:10:33 +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 p3PEAXRX079288;
	Mon, 25 Apr 2011 14:10:33 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3PEAXY9079286;
	Mon, 25 Apr 2011 14:10:33 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201104251410.p3PEAXY9079286@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 25 Apr 2011 14:10:33 +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: r221015 - head/sys/dev/ichwd
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: Mon, 25 Apr 2011 14:10:33 -0000

Author: attilio
Date: Mon Apr 25 14:10:33 2011
New Revision: 221015
URL: http://svn.freebsd.org/changeset/base/221015

Log:
  Don't assume that SMI are enabled when attaching ichwd and then do
  correct unwind based on former state.
  
  Sponsored by:	Sandvine Incorporated
  Reviewed by:	des
  MFC after:	1 week

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

Modified: head/sys/dev/ichwd/ichwd.h
==============================================================================
--- head/sys/dev/ichwd/ichwd.h	Mon Apr 25 13:09:32 2011	(r221014)
+++ head/sys/dev/ichwd/ichwd.h	Mon Apr 25 14:10:33 2011	(r221015)
@@ -45,6 +45,7 @@ struct ichwd_softc {
 	int			 active;
 	unsigned int		 timeout;
 
+	int			 smi_enabled;
 	int			 smi_rid;
 	struct resource		*smi_res;
 	bus_space_tag_t		 smi_bst;