From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 21 Jun 2011 11:24:33 +0000 (+0200)
Subject: lscpu: fix bogomips detection for s390
X-Git-Tag: v2.20-rc1~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f5b7d4b87e4311de7b56eb383a7753028866e61;p=thirdparty%2Futil-linux.git

lscpu: fix bogomips detection for s390

s390 has a "bogomips per cpu" string instead of a "bogomips" string in
/proc/sysinfo. So add a second bogomips lookup which detects the s390
variant.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 8edf99706c..0c49b5447e 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -390,6 +390,8 @@ read_basicinfo(struct lscpu_desc *desc)
 		else if (lookup(buf, "features", &desc->flags)) ;	/* s390 */
 		else if (lookup(buf, "type", &desc->flags)) ;		/* sparc64 */
 		else if (lookup(buf, "bogomips", &desc->bogomips)) ;
+		/* S390 */
+		else if (lookup(buf, "bogomips per cpu", &desc->bogomips)) ;
 		else
 			continue;
 	}