diff --git a/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java b/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
index 039fc37e02745a07207355b78f638147fd9e9e22..e50b6b2d089ec2199123a498c5edccb4f2bc7305 100644
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
@@ -193,8 +193,12 @@ public class HeapSummary extends Tool {
 
    private static final double FACTOR = 1024*1024;
    private void printValMB(String title, long value) {
-      double mb = value / FACTOR;
-      System.out.println(alignment + title + value + " (" + mb + "MB)");
+      if (value < 0) {
+        System.out.println(alignment + title +   (value >>> 20)  + " MB");
+      } else {
+        double mb = value/FACTOR;
+        System.out.println(alignment + title + value + " (" + mb + "MB)");
+      }
    }
 
    private void printValue(String title, long value) {
diff --git a/make/jprt.config b/make/jprt.config
index dd9940763c2c517aa1e610076ec0e248b65f5960..02fdbc0c51b4548bef904d5f735e80a0661cbbef 100644
--- a/make/jprt.config
+++ b/make/jprt.config
@@ -77,9 +77,7 @@ if [ "${osname}" = SunOS ] ; then
             # All jdk6 builds use SS11
             compiler_name=SS11
         else
-            # FIXUP: Change to SS12 once it has been validated.
-	    #compiler_name=SS12
-            compiler_name=SS11
+	    compiler_name=SS12
         fi
     fi
     
diff --git a/make/solaris/makefiles/sparcWorks.make b/make/solaris/makefiles/sparcWorks.make
index 83ef29612ee0f1c99a0ccbe2e582171ae745d143..5bbe70f9f10d03915fa7dafd039849affe38b720 100644
--- a/make/solaris/makefiles/sparcWorks.make
+++ b/make/solaris/makefiles/sparcWorks.make
@@ -51,12 +51,9 @@ ifeq ($(JDK_MINOR_VERSION),6)
   VALIDATED_COMPILER_REV   := 5.8
   VALIDATED_C_COMPILER_REV := 5.8
 else
-  # FIXUP: Change to SS12 (5.9) once it has been validated.
   # Validated compiler for JDK7 is SS12 (5.9)
-  #VALIDATED_COMPILER_REV   := 5.9
-  #VALIDATED_C_COMPILER_REV := 5.9
-  VALIDATED_COMPILER_REV   := 5.8
-  VALIDATED_C_COMPILER_REV := 5.8
+  VALIDATED_COMPILER_REV   := 5.9
+  VALIDATED_C_COMPILER_REV := 5.9
 endif
 
 # Warning messages about not using the above validated version
diff --git a/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp b/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp
index 94377a3beb45dfbf104a6d4a6d25eff858569a2b..d4c641bf0281e9db50230f380f4cb2f56a14a814 100644
--- a/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp
+++ b/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp
@@ -229,7 +229,7 @@ void ParGCAllocBufferWithBOT::retire(bool end_of_gc, bool retain) {
     HeapWord* first_card_start = _bsa->address_for_index(first_card_index);
     if (first_card_start < pre_top) {
       HeapWord* second_card_start =
-        _bsa->address_for_index(first_card_index + 1);
+        _bsa->inc_by_region_size(first_card_start);
 
       // Ensure enough room to fill with the smallest block
       second_card_start = MAX2(second_card_start, pre_top + AlignmentReserve);
diff --git a/src/share/vm/memory/blockOffsetTable.hpp b/src/share/vm/memory/blockOffsetTable.hpp
index a4b6199e8bef7a975f51d1050ed86761c2189287..4357d0a830c23d428ced316148b70d823fb61cd8 100644
--- a/src/share/vm/memory/blockOffsetTable.hpp
+++ b/src/share/vm/memory/blockOffsetTable.hpp
@@ -199,6 +199,12 @@ public:
   // "index" in "_offset_array".
   HeapWord* address_for_index(size_t index) const;
 
+  // Return the address "p" incremented by the size of
+  // a region.  This method does not align the address
+  // returned to the start of a region.  It is a simple
+  // primitive.
+  HeapWord* inc_by_region_size(HeapWord* p) const { return p + N_words; }
+
   // Shared space support
   void serialize(SerializeOopClosure* soc, HeapWord* start, HeapWord* end);
 };
diff --git a/src/share/vm/memory/compactingPermGenGen.cpp b/src/share/vm/memory/compactingPermGenGen.cpp
index af94649ed890e77dc2ff0663e4d7bad66da90ec7..e1de54e38e8cc578e5aa65143ecd23f97603e31b 100644
--- a/src/share/vm/memory/compactingPermGenGen.cpp
+++ b/src/share/vm/memory/compactingPermGenGen.cpp
@@ -421,30 +421,6 @@ size_t CompactingPermGenGen::max_capacity() const {
 }
 
 
-
-bool CompactingPermGenGen::grow_by(size_t bytes) {
-  // Don't allow _virtual_size to expand into shared spaces.
-  size_t max_bytes = _virtual_space.uncommitted_size() - _shared_space_size;
-  if (bytes > _shared_space_size) {
-    bytes = _shared_space_size;
-  }
-  return OneContigSpaceCardGeneration::grow_by(bytes);
-}
-
-
-bool CompactingPermGenGen::grow_to_reserved() {
-  // Don't allow _virtual_size to expand into shared spaces.
-  bool success = false;
-  if (_virtual_space.uncommitted_size() > _shared_space_size) {
-    size_t remaining_bytes =
-      _virtual_space.uncommitted_size() - _shared_space_size;
-    success = OneContigSpaceCardGeneration::grow_by(remaining_bytes);
-    DEBUG_ONLY(if (!success) warning("grow to reserved failed");)
-  }
-  return success;
-}
-
-
 // No young generation references, clear this generation's main space's
 // card table entries.  Do NOT clear the card table entries for the
 // read-only space (always clear) or the read-write space (valuable
diff --git a/src/share/vm/memory/compactingPermGenGen.hpp b/src/share/vm/memory/compactingPermGenGen.hpp
index 4d76e473bde6f7e6d9176d65ab569e9df2500550..3a12a8848de19aba4db9bfeee77e453837895106 100644
--- a/src/share/vm/memory/compactingPermGenGen.hpp
+++ b/src/share/vm/memory/compactingPermGenGen.hpp
@@ -183,8 +183,6 @@ public:
   void compact();
   void post_compact();
   size_t contiguous_available() const;
-  bool grow_by(size_t bytes);
-  virtual bool grow_to_reserved();
 
   void clear_remembered_set();
   void invalidate_remembered_set();
diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp
index 827faed251e2d4bdaa2f6d1764a4b966897bbe8b..50dd4cb23d39350654ceb4d8a561eef2a6a84257 100644
--- a/src/share/vm/runtime/globals.hpp
+++ b/src/share/vm/runtime/globals.hpp
@@ -1470,7 +1470,7 @@ class CommandLineFlags {
           "CMSPrecleanNumerator:CMSPrecleanDenominator yields convergence"  \
           " ratio")                                                         \
                                                                             \
-  product(bool, CMSPrecleanRefLists1, true,                                 \
+  product(bool, CMSPrecleanRefLists1, false,                                \
           "Preclean ref lists during (initial) preclean phase")             \
                                                                             \
   product(bool, CMSPrecleanRefLists2, false,                                \
diff --git a/src/share/vm/runtime/statSampler.cpp b/src/share/vm/runtime/statSampler.cpp
index f7205b9e18986c82137497c4d8b11ad07568c905..d5c4a5f4ffba2d94dff038aa529271ad54cffcba 100644
--- a/src/share/vm/runtime/statSampler.cpp
+++ b/src/share/vm/runtime/statSampler.cpp
@@ -217,6 +217,7 @@ static const char* property_counters_ss[] = {
   "java.class.path",
   "java.endorsed.dirs",
   "java.ext.dirs",
+  "java.version",
   "java.home",
   NULL
 };