# HG changeset patch
# User kvn
# Date 1419381768 28800
# Node ID 000bc11b10781b3de185fb59d7008f10a3dfa714
# Parent  84ded0ce573de84676dce843f865d18c1ed4ac31# Parent  6be786c17d0191941835c10854e2967462b06487
Merge

diff -r 84ded0ce573d -r 000bc11b1078 hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Tue Dec 23 14:03:15 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Tue Dec 23 16:42:48 2014 -0800
@@ -42,6 +42,7 @@
 #include "gc_implementation/shared/isGCActiveMark.hpp"
 #include "gc_interface/collectedHeap.inline.hpp"
 #include "memory/allocation.hpp"
+#include "memory/cardGeneration.inline.hpp"
 #include "memory/cardTableRS.hpp"
 #include "memory/collectorPolicy.hpp"
 #include "memory/gcLocker.inline.hpp"
diff -r 84ded0ce573d -r 000bc11b1078 hotspot/src/share/vm/memory/tenuredGeneration.cpp
--- a/hotspot/src/share/vm/memory/tenuredGeneration.cpp	Tue Dec 23 14:03:15 2014 +0100
+++ b/hotspot/src/share/vm/memory/tenuredGeneration.cpp	Tue Dec 23 16:42:48 2014 -0800
@@ -28,6 +28,7 @@
 #include "gc_implementation/shared/parGCAllocBuffer.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/blockOffsetTable.inline.hpp"
+#include "memory/cardGeneration.inline.hpp"
 #include "memory/generationSpec.hpp"
 #include "memory/genMarkSweep.hpp"
 #include "memory/genOopClosures.inline.hpp"
diff -r 84ded0ce573d -r 000bc11b1078 hotspot/test/compiler/arguments/CheckCompileThresholdScaling.java
--- a/hotspot/test/compiler/arguments/CheckCompileThresholdScaling.java	Tue Dec 23 14:03:15 2014 +0100
+++ b/hotspot/test/compiler/arguments/CheckCompileThresholdScaling.java	Tue Dec 23 16:42:48 2014 -0800
@@ -330,7 +330,7 @@
         } catch (RuntimeException e) {
             // Check if tiered compilation is available in this JVM
             // Version. Throw exception only if it is available.
-            if (!(tiered && out.getOutput().contains("Client VM warning: TieredCompilation is disabled in this release."))) {
+            if (!(tiered && out.getOutput().contains("TieredCompilation is disabled in this release."))) {
                 throw new RuntimeException(e);
             }
         }