# HG changeset patch
# User jcoomes
# Date 1334102062 25200
# Node ID ad6f5eaa165edc94caaa0ac582828718a63a3d02
# Parent  30e3475c1a45716c9a60dff2c81763d5a8ea48b8# Parent  bf81dbf47dec37b2878bcfd68f74fec8b15f987b
Merge

diff -r 30e3475c1a45 -r ad6f5eaa165e .hgtags
--- a/.hgtags	Thu Apr 05 15:09:58 2012 -0700
+++ b/.hgtags	Tue Apr 10 16:54:22 2012 -0700
@@ -275,3 +275,4 @@
 f1b786625e0c2ce215d70dda637a127edb2688f2 jdk7u4-b18
 1834c6835b75ed0c0f6fdb55a4ae56cc82e0f15c hs23-b20
 a1292d4e07097cf68addadca35553fd1255dc555 jdk7u4-b19
+34fce1d343b0d9f5e1e5ea30d93e840d260f3dce hs23-b21
diff -r 30e3475c1a45 -r ad6f5eaa165e make/hotspot_version
--- a/make/hotspot_version	Thu Apr 05 15:09:58 2012 -0700
+++ b/make/hotspot_version	Tue Apr 10 16:54:22 2012 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=23
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=20
+HS_BUILD_NUMBER=21
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
diff -r 30e3475c1a45 -r ad6f5eaa165e src/cpu/sparc/vm/c2_globals_sparc.hpp
--- a/src/cpu/sparc/vm/c2_globals_sparc.hpp	Thu Apr 05 15:09:58 2012 -0700
+++ b/src/cpu/sparc/vm/c2_globals_sparc.hpp	Tue Apr 10 16:54:22 2012 -0700
@@ -42,7 +42,7 @@
 #else
 define_pd_global(bool, ProfileInterpreter,           true);
 #endif // CC_INTERP
-define_pd_global(bool, TieredCompilation,            trueInTiered);
+define_pd_global(bool, TieredCompilation,            false);
 define_pd_global(intx, CompileThreshold,             10000);
 define_pd_global(intx, BackEdgeThreshold,            140000);
 
diff -r 30e3475c1a45 -r ad6f5eaa165e src/cpu/x86/vm/c2_globals_x86.hpp
--- a/src/cpu/x86/vm/c2_globals_x86.hpp	Thu Apr 05 15:09:58 2012 -0700
+++ b/src/cpu/x86/vm/c2_globals_x86.hpp	Tue Apr 10 16:54:22 2012 -0700
@@ -44,7 +44,7 @@
 #else
 define_pd_global(bool, ProfileInterpreter,           true);
 #endif // CC_INTERP
-define_pd_global(bool, TieredCompilation,            trueInTiered);
+define_pd_global(bool, TieredCompilation,            false);
 define_pd_global(intx, CompileThreshold,             10000);
 define_pd_global(intx, BackEdgeThreshold,            100000);