2 files changed, 24 insertions, 6 deletions
diff --git a/src/checksum/power8/crc32_wrapper.c b/src/checksum/power8/crc32_wrapper.c
index ddfa2bdaeb8..a9be9ced1c6 100644
--- a/src/checksum/power8/crc32_wrapper.c
+++ b/src/checksum/power8/crc32_wrapper.c
@@ -1,4 +1,6 @@
 #if defined(__powerpc64__)
+#include "wt_internal.h"
+
 #define CRC_TABLE
 #include "crc32_constants.h"
 
@@ -68,8 +70,6 @@ out:
 }
 #endif
 
-#include "wt_internal.h"
-
 /*
  * __wt_checksum_hw --
  *	WiredTiger: return a checksum for a chunk of memory.
diff --git a/src/checksum/zseries/crc32-s390x.c b/src/checksum/zseries/crc32-s390x.c
index f77d6768d42..28b46594220 100644
--- a/src/checksum/zseries/crc32-s390x.c
+++ b/src/checksum/zseries/crc32-s390x.c
@@ -6,8 +6,20 @@
  * Author(s): Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
  *
  */
+#include "wt_internal.h"
+
 #include <sys/types.h>
 #include <endian.h>
+
+#if defined(HAVE_CRC32_HARDWARE)
+
+#include <sys/auxv.h>
+
+/* RHEL 7 has kernel support, but does not define this constant in the lib c headers. */
+#ifndef HWCAP_S390_VX
+#define HWCAP_S390_VX           2048
+#endif
+
 #include "crc32-s390x.h"
 #include "slicing-consts.h"
 
@@ -69,8 +81,6 @@ unsigned int __wt_crc32c_le(unsigned int crc, const unsigned char *buf, size_t l
 /* Main CRC-32 functions */
 DEFINE_CRC32_VX(__wt_crc32c_le_vx, __wt_crc32c_le_vgfm_16, __wt_crc32c_le)
 
-#include "wt_internal.h"
-
 /*
  * __wt_checksum_hw --
  *      WiredTiger: return a checksum for a chunk of memory.
@@ -81,6 +91,8 @@ __wt_checksum_hw(const void *chunk, size_t len)
 	return (~__wt_crc32c_le_vx(0xffffffff, chunk, len));
 }
 
+#endif
+
 /*
  * __wt_checksum_init --
  *      WiredTiger: detect CRC hardware and set the checksum function.
@@ -89,8 +101,14 @@ void
 __wt_checksum_init(void)
 {
 #if defined(HAVE_CRC32_HARDWARE)
-	__wt_process.checksum = __wt_checksum_hw;
-#else
+	unsigned long caps = getauxval(AT_HWCAP);
+
+	if (caps & HWCAP_S390_VX)
+		__wt_process.checksum = __wt_checksum_hw;
+	else
+		__wt_process.checksum = __wt_checksum_sw;
+
+#else /* !HAVE_CRC32_HARDWARE */
 	__wt_process.checksum = __wt_checksum_sw;
 #endif
 }