--- a/hotspot/src/share/vm/opto/library_call.cpp	Tue Dec 27 16:10:59 2016 +0100
+++ b/hotspot/src/share/vm/opto/library_call.cpp	Tue Jan 03 17:17:14 2017 +0100
@@ -6335,7 +6335,7 @@
 
 //------------------------------get_key_start_from_aescrypt_object-----------------------
 Node * LibraryCallKit::get_key_start_from_aescrypt_object(Node *aescrypt_object) {
-#ifdef PPC64
+#if defined(PPC64) || defined(S390)
   // MixColumns for decryption can be reduced by preprocessing MixColumns with round keys.
   // Intel's extention is based on this optimization and AESCrypt generates round keys by preprocessing MixColumns.
   // However, ppc64 vncipher processes MixColumns and requires the same round keys with encryption.