summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2019-03-19 16:56:28 +0100
committerKarel Zak2019-03-19 16:56:28 +0100
commita44cd89128bc83c5850f392f82c1dbfcc750df21 (patch)
tree8e55697d1e6ac2aeb1d69c004626e45d2fed20af
parentlscpu: fix and document --output-all (diff)
downloadkernel-qcow2-util-linux-a44cd89128bc83c5850f392f82c1dbfcc750df21.tar.gz
kernel-qcow2-util-linux-a44cd89128bc83c5850f392f82c1dbfcc750df21.tar.xz
kernel-qcow2-util-linux-a44cd89128bc83c5850f392f82c1dbfcc750df21.zip
lscpu: fix excl[] array order
It (rows and columns) must be in ASCII order. Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--misc-utils/lsblk.c1
-rw-r--r--sys-utils/lscpu.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 3e9b96a4d..ad5af4721 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1821,6 +1821,7 @@ int main(int argc, char *argv[])
{ 'O','S' },
{ 'O','f' },
{ 'O','m' },
+ { 'O','o' },
{ 'O','t' },
{ 'P','T', 'l','r' },
{ 0 }
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index b1b980088..c853406ef 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -2164,8 +2164,8 @@ int main(int argc, char *argv[])
};
static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
- { 'a','b','c' },
{ 'C','e','p' },
+ { 'a','b','c' },
{ 0 }
};
int excl_st[ARRAY_SIZE(excl)] = UL_EXCL_STATUS_INIT;