diff -r f7babf9d1592 -r 84743156e780 src/hotspot/cpu/s390/macroAssembler_s390.hpp
--- a/src/hotspot/cpu/s390/macroAssembler_s390.hpp	Wed Oct 03 11:43:39 2018 +0530
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.hpp	Wed Oct 03 03:41:57 2018 -0400
@@ -593,7 +593,6 @@
   static int call_far_patchable_ret_addr_offset() { return call_far_patchable_size(); }
 
   static bool call_far_patchable_requires_alignment_nop(address pc) {
-    if (!os::is_MP()) return false;
     int size = call_far_patchable_size();
     return ((intptr_t)(pc + size) & 0x03L) != 0;
   }