--- a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp	Thu Dec 14 12:02:16 2017 +0100
+++ b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp	Thu Dec 14 13:05:20 2017 +0100
@@ -54,4 +54,6 @@
 
 #define SUPPORT_RESERVED_STACK_AREA
 
+#define THREAD_LOCAL_POLL
+
 #endif // CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP