From: Karel Zak <kzak@redhat.com>
Date: Tue, 19 Mar 2019 15:56:28 +0000 (+0100)
Subject: lscpu: fix excl[] array order
X-Git-Tag: v2.34-rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a44cd89128bc83c5850f392f82c1dbfcc750df21;p=thirdparty%2Futil-linux.git

lscpu: fix excl[] array order

It (rows and columns) must be in ASCII order.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 3e9b96a4d5..ad5af4721f 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 b1b980088b..c853406efb 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;