hg: jdk9/hs-gc/hotspot: 8065993: Merge OneContigSpaceCardGeneration with TenuredGeneration

[bengt.rutisson at oracle.com]

Changeset: f84495a81488
Author:    brutisso
Date:      2014-12-01 14:37 +0100
URL:       http://hg.openjdk.java.net/jdk9/hs-gc/hotspot/rev/f84495a81488

8065993: Merge OneContigSpaceCardGeneration with TenuredGeneration
Reviewed-by: mgerdin, kbarrett

! agent/src/share/classes/sun/jvm/hotspot/memory/Generation.java
- agent/src/share/classes/sun/jvm/hotspot/memory/OneContigSpaceCardGeneration.java
! agent/src/share/classes/sun/jvm/hotspot/memory/TenuredGeneration.java
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp
! src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
! src/share/vm/memory/cardTableModRefBS.cpp
! src/share/vm/memory/defNewGeneration.hpp
! src/share/vm/memory/genCollectedHeap.cpp
! src/share/vm/memory/genMarkSweep.cpp
! src/share/vm/memory/generation.cpp
! src/share/vm/memory/generation.hpp
- src/share/vm/memory/generation.inline.hpp
! src/share/vm/memory/space.hpp
! src/share/vm/memory/tenuredGeneration.cpp
! src/share/vm/memory/tenuredGeneration.hpp
+ src/share/vm/memory/tenuredGeneration.inline.hpp
! src/share/vm/precompiled/precompiled.hpp
! src/share/vm/runtime/vmStructs.cpp