hg: hsx/hotspot-rt/hotspot: 2 new changesets

[coleen.phillimore at oracle.com]

Changeset: 7df3125953cb
Author:    coleenp
Date:      2012-02-16 15:52 -0500
URL:       http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/7df3125953cb

7146354: Re-enable Compressed OOPs after 7118647 is resolved
Summary: Relax the assertion to simply check for COOP mode rather than an exact address.
Reviewed-by: coleenp, kvn, phh, dcubed
Contributed-by: james.melvin at oracle.com

! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/virtualspace.cpp

Changeset: df4927a3b82e
Author:    coleenp
Date:      2012-02-16 17:19 -0500
URL:       http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/df4927a3b82e

Merge