hg: jdk7/hotspot-gc/hotspot: 7020042: G1: Partially remove fix for 6994628

[john.cuthbertson at oracle.com]

Changeset: 8f1042ff784d
Author:    johnc
Date:      2011-02-18 10:07 -0800
URL:       http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/8f1042ff784d

7020042: G1: Partially remove fix for 6994628
Summary: Disable reference discovery and processing during concurrent marking by disabling fix for 6994628.
Reviewed-by: tonyp, ysr

! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/gc_implementation/g1/g1_globals.hpp