From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Thu, 2 Jul 2020 10:16:22 +0000 (+0000)
Subject: revert a680b2abe725f4d5240
X-Git-Tag: v2.36-rc2~19^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad6aef0ea87fe3778dedf0aa2ee26ac5ad3ae39f;p=thirdparty%2Futil-linux.git

revert a680b2abe725f4d5240

It's not clear what that commit was supposed to fix. Looks like
772420322deb14b2ff should have helped there.
---

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 1e279915dd..ca085b665a 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -36,11 +36,7 @@
 #include <sys/personality.h>
 
 #if (defined(__x86_64__) || defined(__i386__))
-# if !defined( __SANITIZE_ADDRESS__)
-#  define INCLUDE_VMWARE_BDOOR
-# else
-#  warning VMWARE detection disabled by __SANITIZE_ADDRESS__
-# endif
+# define INCLUDE_VMWARE_BDOOR
 #endif
 
 #ifdef INCLUDE_VMWARE_BDOOR