svn commit: r225118 - stable/8/sys/dev/gem

[Marius Strobl]

Author: marius
Date: Tue Aug 23 14:37:39 2011
New Revision: 225118
URL: http://svn.freebsd.org/changeset/base/225118

Log:
  MFC: r225015
  
  Revert r224157 (MFC'ed to stable/8 in r224401), re-enabling r222135 (MFC'ed
  to stable/8 in r222371). The underlying problem keeping the latter from
  working as expected was fixed in r225014 (MFC'ed to stable/8 in r225116).

Modified:
  stable/8/sys/dev/gem/if_gem.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/gem/if_gem.c
==============================================================================
--- stable/8/sys/dev/gem/if_gem.c	Tue Aug 23 14:32:59 2011	(r225117)
+++ stable/8/sys/dev/gem/if_gem.c	Tue Aug 23 14:37:39 2011	(r225118)
@@ -947,10 +947,8 @@ 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),