*** old/src/share/vm/runtime/globals.hpp	Thu Jun 25 16:48:34 2015
--- new/src/share/vm/runtime/globals.hpp	Thu Jun 25 16:48:34 2015

*** 370,392 ****
--- 370,380 ----
    // printRanges will print out flags type, name and range values as expected by -XX:+PrintFlagsRanges
    void print_on(outputStream* st, bool withComments = false, bool printRanges = false);
    void print_kind(outputStream* st);
    void print_as_flag(outputStream* st);
  
!   static const char* flag_error_str(Flag::Error error) {
      switch (error) {
        case Flag::MISSING_NAME: return "MISSING_NAME";
        case Flag::MISSING_VALUE: return "MISSING_VALUE";
        case Flag::NON_WRITABLE: return "NON_WRITABLE";
        case Flag::OUT_OF_BOUNDS: return "OUT_OF_BOUNDS";
        case Flag::VIOLATES_CONSTRAINT: return "VIOLATES_CONSTRAINT";
        case Flag::INVALID_FLAG: return "INVALID_FLAG";
        case Flag::ERR_OTHER: return "ERR_OTHER";
        case Flag::SUCCESS: return "SUCCESS";
        default: return "NULL";
      }
    }
!   static const char* flag_error_str(Flag::Error error);
  };
  
  // debug flags control various aspects of the VM and are global accessible
  
  // use FlagSetting to temporarily change some debug flag

*** 1561,1571 ****
--- 1549,1559 ----
            "parallel threads parallel gc will use to aid debugging")         \
                                                                              \
    product(size_t, HeapSizePerGCThread, ScaleForWordSize(64*M),              \
            "Size of heap (bytes) per GC thread used in calculating the "     \
            "number of GC threads")                                           \
!           range((uintx)os::vm_page_size(), max_uintx)                       \
!           range((size_t)os::vm_page_size(), (size_t)max_uintx)              \
                                                                              \
    product(bool, TraceDynamicGCThreads, false,                               \
            "Trace the dynamic GC thread usage")                              \
                                                                              \
    develop(bool, ParallelOldGCSplitALot, false,                              \

*** 1841,1850 ****
--- 1829,1839 ----
            "Restore preserved marks early")                                  \
                                                                              \
    product(size_t, MarkStackSize, NOT_LP64(32*K) LP64_ONLY(4*M),             \
            "Size of marking stack")                                          \
                                                                              \
+   /* where does the range max value of (max_jint - 1) come from? */         \
    product(size_t, MarkStackSizeMax, NOT_LP64(4*M) LP64_ONLY(512*M),         \
            "Maximum size of marking stack")                                  \
            range(1, (max_jint - 1))                                          \
                                                                              \
    notproduct(bool, CMSMarkStackOverflowALot, false,                         \