--- a/src/hotspot/cpu/s390/vm_version_s390.cpp Mon Nov 18 16:10:32 2019 +0100
+++ b/src/hotspot/cpu/s390/vm_version_s390.cpp Mon Nov 18 17:11:06 2019 +0100
@@ -31,7 +31,7 @@
#include "memory/resourceArea.hpp"
#include "runtime/java.hpp"
#include "runtime/stubCodeGenerator.hpp"
-#include "vm_version_s390.hpp"
+#include "runtime/vm_version.hpp"
# include <sys/sysinfo.h>
@@ -44,8 +44,8 @@
unsigned int VM_Version::_nfeatures = 0;
unsigned int VM_Version::_ncipher_features = 0;
unsigned int VM_Version::_nmsgdigest_features = 0;
-unsigned int VM_Version::_Dcache_lineSize = 256;
-unsigned int VM_Version::_Icache_lineSize = 256;
+unsigned int VM_Version::_Dcache_lineSize = DEFAULT_CACHE_LINE_SIZE;
+unsigned int VM_Version::_Icache_lineSize = DEFAULT_CACHE_LINE_SIZE;
static const char* z_gen[] = {" ", "G1", "G2", "G3", "G4", "G5", "G6", "G7" };
static const char* z_machine[] = {" ", "2064", "2084", "2094", "2097", "2817", " ", "2964" };