--- old/src/hotspot/cpu/s390/macroAssembler_s390.hpp	2018-09-26 10:00:54.568084829 -0400
+++ new/src/hotspot/cpu/s390/macroAssembler_s390.hpp	2018-09-26 10:00:53.015994508 -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;
   }