From owner-svn-src-all@FreeBSD.ORG  Mon Jul 25 20:13:35 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 D1471106566B;
	Mon, 25 Jul 2011 20:13:35 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C07BF8FC12;
	Mon, 25 Jul 2011 20:13:35 +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 p6PKDZgf075400;
	Mon, 25 Jul 2011 20:13:35 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6PKDZ48075398;
	Mon, 25 Jul 2011 20:13:35 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201107252013.p6PKDZ48075398@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Mon, 25 Jul 2011 20:13:35 +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: r224402 - stable/7/sys/dev/gem
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 Jul 2011 20:13:35 -0000

Author: yongari
Date: Mon Jul 25 20:13:35 2011
New Revision: 224402
URL: http://svn.freebsd.org/changeset/base/224402

Log:
  MFC r224157:
    Revert r222135 by allowing controller reinitialization.  Due to
    unknown reason Apple UniNorth2 gem(4) device required manual
    interface down/up operation after r222135.  Even though this is not
    correct thing and I don't like to revert it but it would be better
    than breaking gem(4) on PPC.  This should be revisited.
  
    PR:	kern/157405

Modified:
  stable/7/sys/dev/gem/if_gem.c
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/gem/if_gem.c
==============================================================================
--- stable/7/sys/dev/gem/if_gem.c	Mon Jul 25 20:12:31 2011	(r224401)
+++ stable/7/sys/dev/gem/if_gem.c	Mon Jul 25 20:13:35 2011	(r224402)
@@ -947,8 +947,10 @@ gem_init_locked(struct gem_softc *sc)
 
 	GEM_LOCK_ASSERT(sc, MA_OWNED);
 
+#ifdef notyet
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
 		return;
+#endif
 
 #ifdef GEM_DEBUG
 	CTR2(KTR_GEM, "%s: %s: calling stop", device_get_name(sc->sc_dev),