hg: hsx/hsx20/baseline: 7020042: G1: Partially remove fix for 6994628

[john.cuthbertson at oracle.com]

Changeset: 1ec37096cecf
Author:    johnc
Date:      2011-02-18 10:07 -0800
URL:       http://hg.openjdk.java.net/hsx/hsx20/baseline/rev/1ec37096cecf

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