--- a/src/hotspot/cpu/s390/globals_s390.hpp	Thu Dec 14 12:02:16 2017 +0100
+++ b/src/hotspot/cpu/s390/globals_s390.hpp	Thu Dec 14 13:05:20 2017 +0100
@@ -85,7 +85,7 @@
 // 8146801 (Short Array Allocation): No performance work done here yet.
 define_pd_global(intx, InitArrayShortSize, 1*BytesPerLong);
 
-define_pd_global(bool, ThreadLocalHandshakes, false);
+define_pd_global(bool, ThreadLocalHandshakes, true);
 
 #define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct, range, constraint, writeable) \
                                                                               \