From: John Wolfe <jwolfe@vmware.com>
Date: Wed, 12 Oct 2022 19:40:36 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.2.0~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=521eecf6eb591c7ef6106f9f44eee728c14a5795;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_atomic_arm64_begin.h b/open-vm-tools/lib/include/vm_atomic_arm64_begin.h
index d2cd196c5..43c231020 100644
--- a/open-vm-tools/lib/include/vm_atomic_arm64_begin.h
+++ b/open-vm-tools/lib/include/vm_atomic_arm64_begin.h
@@ -51,9 +51,9 @@
 #ifndef _VMATOM_HAVE_LSE_DEFINED
 typedef struct  {
    Bool LsePresent;
-#ifdef USERLEVEL
+#ifndef VMKERNEL
    Bool ProbedForLse;
-#endif /* Atomic_LsePresent */
+#endif
    Bool PreferCasForOps;
 } Atomic_ConfigParams;
 
@@ -63,17 +63,17 @@ typedef struct  {
  * When buidling for kernel mode, Atomic_Config is exported by
  * bora/vmkernel/lib/arm64/atomic.c
  */
-#ifdef USERLEVEL
+#ifndef VMKERNEL
 #pragma weak Atomic_Config
 Atomic_ConfigParams Atomic_Config;
-#else /* !USERLEVEL */
+#else
 extern Atomic_ConfigParams Atomic_Config;
-#endif /* !USERLEVEL */
+#endif
 
 static INLINE Bool
 Atomic_HaveLse(void)
 {
-#ifdef USERLEVEL
+#ifndef VMKERNEL
    /*
     * Can't just include sys/auxv.h, unfortunately.
     */
@@ -93,7 +93,7 @@ Atomic_HaveLse(void)
 #undef _VMATOM_AT_ESXI_HWCAP
 #undef _VMATOM_AT_ESXI_HWCAP_HAVE_LSE
 #undef _VMATOM_AT_ESXI_HWCAP_PREFER_CAS_FOR_OPS
-#endif /* USERLEVEL */
+#endif
 
    return Atomic_Config.LsePresent;
 }