Merge branch release-2018

[alexxy/gromacs.git] / src / gromacs / hardware / cpuinfo.cpp

diff --git a/src/gromacs/hardware/cpuinfo.cpp b/src/gromacs/hardware/cpuinfo.cpp
index 273d8d8e2c23fbb57560819d4d96b38d8bd44053..917bdeda609701c188842aa4f38b74b23941defe 100644 (file)
--- a/src/gromacs/hardware/cpuinfo.cpp
+++ b/src/gromacs/hardware/cpuinfo.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -778,6 +778,11 @@ detectProcCpuInfoArm(const std::map<std::string, std::string>   &cpuInfo,
     {
         *brand = cpuInfo.at("Processor");
     }
+    else if (cpuInfo.count("model name"))
+    {
+        *brand = cpuInfo.at("model name");
+    }
+
     if (cpuInfo.count("CPU architecture"))
     {
         *family = std::strtol(cpuInfo.at("CPU architecture").c_str(), nullptr, 10);