# HG changeset patch
# User asaha
# Date 1435185400 25200
# Node ID 0cc9360761a5974fcac4aeb9774294f8094a869a
# Parent  9dc578eda2410c511679779b37f3dc8626aaeb2d# Parent  049a2c17a4f21f67db52141fb860d3761d999c87
Merge

diff -r 9dc578eda241 -r 0cc9360761a5 .hgtags
--- a/.hgtags	Mon Jun 22 11:34:42 2015 -0700
+++ b/.hgtags	Wed Jun 24 15:36:40 2015 -0700
@@ -707,6 +707,8 @@
 bd9221771f6e34e63b3b340ffcf9906ccf882dae jdk8u60-b19
 e01a710549a962cee94728271248a7d89fb56c49 hs25.60-b20
 3b6c97747ccc61d189bca64b4afa3ffc13680810 jdk8u60-b20
+4b6687a4f2fe84211b8b3b5afb34b5186afbddf6 hs25.60-b21
+e0d75c284bd1c09fd7d9ef09627d8a99b88d468d jdk8u60-b21
 0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06
 9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07
 0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00
diff -r 9dc578eda241 -r 0cc9360761a5 make/hotspot_version
diff -r 9dc578eda241 -r 0cc9360761a5 src/share/vm/memory/genMarkSweep.cpp
--- a/src/share/vm/memory/genMarkSweep.cpp	Mon Jun 22 11:34:42 2015 -0700
+++ b/src/share/vm/memory/genMarkSweep.cpp	Wed Jun 24 15:36:40 2015 -0700
@@ -211,7 +211,7 @@
                          false, // Younger gens are not roots.
                          true,  // activate StrongRootsScope
                          GenCollectedHeap::SO_None,
-                         GenCollectedHeap::StrongRootsOnly,
+                         ClassUnloading,
                          &follow_root_closure,
                          &follow_root_closure,
                          &follow_cld_closure);
diff -r 9dc578eda241 -r 0cc9360761a5 src/share/vm/memory/heap.cpp
--- a/src/share/vm/memory/heap.cpp	Mon Jun 22 11:34:42 2015 -0700
+++ b/src/share/vm/memory/heap.cpp	Wed Jun 24 15:36:40 2015 -0700
@@ -99,9 +99,7 @@
   // Reserve and initialize space for _memory.
   size_t page_size = os::vm_page_size();
   if (os::can_execute_large_page_memory()) {
-    const size_t min_pages = 8;
-    page_size = MIN2(os::page_size_for_region_aligned(committed_size, min_pages),
-                     os::page_size_for_region_aligned(reserved_size, min_pages));
+    page_size = os::page_size_for_region_unaligned(reserved_size, 8);
   }
 
   const size_t granularity = os::vm_allocation_granularity();
diff -r 9dc578eda241 -r 0cc9360761a5 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Mon Jun 22 11:34:42 2015 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Wed Jun 24 15:36:40 2015 -0700
@@ -1372,6 +1372,12 @@
   if (!FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim) || !FLAG_IS_DEFAULT(OldPLABWeight)) {
     CFLS_LAB::modify_initialization(OldPLABSize, OldPLABWeight);
   }
+
+  if (!ClassUnloading) {
+    FLAG_SET_CMDLINE(bool, CMSClassUnloadingEnabled, false);
+    FLAG_SET_CMDLINE(bool, ExplicitGCInvokesConcurrentAndUnloadsClasses, false);
+  }
+
   if (PrintGCDetails && Verbose) {
     tty->print_cr("MarkStackSize: %uk  MarkStackSizeMax: %uk",
       (unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));