Merge
authoriignatyev
Tue, 15 Aug 2017 02:49:48 +0000
changeset 46813 3d71dbbe1c94
parent 46811 f4ded11e0f74 (diff)
parent 46812 0cffd1dd151d (current diff)
child 46814 2e45cd2fdcb6
Merge
--- a/hotspot/src/os/linux/vm/os_linux.cpp	Mon Aug 14 12:35:38 2017 -0700
+++ b/hotspot/src/os/linux/vm/os_linux.cpp	Tue Aug 15 02:49:48 2017 +0000
@@ -2201,6 +2201,8 @@
 
 #if defined(AMD64) || defined(IA32) || defined(X32)
 const char* search_string = "model name";
+#elif defined(M68K)
+const char* search_string = "CPU";
 #elif defined(PPC64)
 const char* search_string = "cpu";
 #elif defined(S390)