diff options
| author | Heiko Carstens | 2016-06-22 09:26:00 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-06-24 10:54:09 +0200 |
| commit | 8eb9604a341871e2c10c57c6b5cd8dba54fab577 (patch) | |
| tree | fb9234b8735ca52685637b4971b769cc4da0f844 /tests/expected/lscpu | |
| parent | lscpu: show additional caches (s390) (diff) | |
| download | kernel-qcow2-util-linux-8eb9604a341871e2c10c57c6b5cd8dba54fab577.tar.gz kernel-qcow2-util-linux-8eb9604a341871e2c10c57c6b5cd8dba54fab577.tar.xz kernel-qcow2-util-linux-8eb9604a341871e2c10c57c6b5cd8dba54fab577.zip | |
lscpu: update s390-lpar-drawer testcase
I noticed that the "cpu" line within /proc/cpuinfo has a different
meaning on powerpc and sparc than on s390.
On s390 it represents the cpu number while on powerpc and sparc it
represent the model name. Given that the s390 kernel patch which adds
the "cpu" line to /proc/cpuinfo hasn't been merged into the kernel
yet, I changed that line to "cpu number" to avoid the unnecessary
conflict.
Therefore this patch updates the testcase, which mainly changes the
contents of /proc/cpuinfo.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'tests/expected/lscpu')
| -rw-r--r-- | tests/expected/lscpu/lscpu-s390-lpar-drawer | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/expected/lscpu/lscpu-s390-lpar-drawer b/tests/expected/lscpu/lscpu-s390-lpar-drawer index 75ee33ff7..2309f1db4 100644 --- a/tests/expected/lscpu/lscpu-s390-lpar-drawer +++ b/tests/expected/lscpu/lscpu-s390-lpar-drawer @@ -9,7 +9,6 @@ Drawer(s): 4 NUMA node(s): 1 Vendor ID: IBM/S390 Machine type: 2964 -Model name: 0 CPU dynamic MHz: 5000 CPU static MHz: 5000 BogoMIPS: 20325.00 @@ -32,7 +31,7 @@ Flags: esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs # CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i 0,0,0,0,,0,0,0,0 1,1,0,0,,1,1,1,1 -2,2,0,0,,2,2,2,2 +2,2,1,0,,2,2,2,2 3,3,1,0,,3,3,3,3 4,4,1,0,,4,4,4,4 5,5,1,0,,5,5,5,5 |