Author: marius
Date: Tue Aug 23 14:37:42 2011
New Revision: 225119
URL: http://svn.freebsd.org/changeset/base/225119
Log:
MFC: r225015
Revert r224157 (MFC'ed to stable/7 in r224402), re-enabling r222135 (MFC'ed
to stable/7 in r222372). The underlying problem keeping the latter from
working as expected was fixed in r225014 (MFC'ed to stable/7 in r225117).
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 Tue Aug 23 14:37:39 2011
(r225118)
+++ stable/7/sys/dev/gem/if_gem.c Tue Aug 23 14:37:42 2011
(r225119)
@@ -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),
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
