On 25.06.2012 13:26, Daniel P. Berrange wrote:
On Fri, Jun 22, 2012 at 01:50:12PM +0200, Viktor Mihajlovski wrote:
From: Thang Pham <thang.pham@us.ibm.com>
Minimal CPU "parser" for s390 to avoid compile time warning.
Signed-off-by: Thang Pham <thang.pham@us.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com> --- src/nodeinfo.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/nodeinfo.c b/src/nodeinfo.c index f7d0cc6..7eb5ae5 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -315,6 +315,11 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, * and parsed in next iteration, because it is not in expected * format and thus lead to error. */ } +# elif defined(__s390__) || \ + defined(__s390x__) + /* s390x has no realistic value for CPU speed, + * assign a value of zero to signify this */ + nodeinfo->mhz = 0; # else # warning Parser for /proc/cpuinfo needs to be adapted for your architecture # endif
ACK
Daniel
Pushed now. Michal