diff -r c19054f06c14 -r 552a97e8edad src/hotspot/share/runtime/arguments.cpp --- a/src/hotspot/share/runtime/arguments.cpp Mon Oct 02 17:20:14 2017 +0300 +++ b/src/hotspot/share/runtime/arguments.cpp Mon Oct 02 18:56:30 2017 -0400 @@ -377,6 +377,7 @@ // --- Non-alias flags - sorted by obsolete_in then expired_in: { "MaxGCMinorPauseMillis", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() }, { "UseConcMarkSweepGC", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() }, + { "AssumeMP", JDK_Version::jdk(10),JDK_Version::undefined(), JDK_Version::undefined() }, { "MonitorInUseLists", JDK_Version::jdk(10),JDK_Version::undefined(), JDK_Version::undefined() }, { "MaxRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, { "MinRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, @@ -4476,16 +4477,6 @@ set_shared_spaces_flags(); -#if defined(SPARC) - // BIS instructions require 'membar' instruction regardless of the number - // of CPUs because in virtualized/container environments which might use only 1 - // CPU, BIS instructions may produce incorrect results. - - if (FLAG_IS_DEFAULT(AssumeMP)) { - FLAG_SET_DEFAULT(AssumeMP, true); - } -#endif - // Check the GC selections again. if (!check_gc_consistency()) { return JNI_EINVAL;