---
 src/hotspot/cpu/s390/vm_version_s390.cpp | 9 ---------
 src/hotspot/share/jbolt/jBoltDcmds.cpp   | 9 ++++++++-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/cpu/s390/vm_version_s390.cpp b/src/hotspot/cpu/s390/vm_version_s390.cpp
index 32b6a07ff..5ee2b66d3 100644
--- a/src/hotspot/cpu/s390/vm_version_s390.cpp
+++ b/src/hotspot/cpu/s390/vm_version_s390.cpp
@@ -301,16 +301,6 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UsePopCountInstruction, true);
   }
 
-  if (UnlockExperimentalVMOptions && UseHashMapIntegerCache && !FLAG_IS_DEFAULT(UseHashMapIntegerCache)) {
-    FLAG_SET_DEFAULT(UseHashMapIntegerCache, false);
-    warning("HashMap optimization is not supported in this VM.");
-  }
-
-  if (UnlockExperimentalVMOptions && UseFastSerializer && !FLAG_IS_DEFAULT(UseFastSerializer)) {
-    FLAG_SET_DEFAULT(UseFastSerializer, false);
-    warning("Serializer optimization is not supported in this VM.");
-  }
-
   // z/Architecture supports 8-byte compare-exchange operations
   // (see Atomic::cmpxchg)
   // and 'atomic long memory ops' (see Unsafe_GetLongVolatile).
diff --git a/src/hotspot/share/jbolt/jBoltDcmds.cpp b/src/hotspot/share/jbolt/jBoltDcmds.cpp
index 0cf1c75b4..7e9ba52a8 100644
--- a/src/hotspot/share/jbolt/jBoltDcmds.cpp
+++ b/src/hotspot/share/jbolt/jBoltDcmds.cpp
@@ -24,6 +24,9 @@
 #include "jbolt/jBoltDcmds.hpp"
 #include "jbolt/jBoltControlThread.hpp"
 #include "jbolt/jBoltManager.hpp"
+#ifdef  __linux__
+#include "os_posix.hpp"
+#endif
 
 bool register_jbolt_dcmds() {
   uint32_t full_export = DCmd_Source_Internal | DCmd_Source_AttachAPI | DCmd_Source_MBean;
@@ -198,8 +201,12 @@ void JBoltDumpDCmd::execute(DCmdSource source, TRAPS) {
       output()->print_cr("Failed: File open error or NULL: %s", path);
       break;
     case JBoltOK:
-      rp = realpath(path, buffer);
+#ifdef  __linux__
+      rp = os::Posix::realpath(path, buffer, sizeof(buffer));
       output()->print_cr("Successful: Dump to %s", buffer);
+#else
+      output()->print_cr("Successful: Dump to %s", path);
+#endif
       break;
     default:
       ShouldNotReachHere();
-- 
2.31.1