Change to common header file not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/vm_basic_asm.h b/open-vm-tools/lib/include/vm_basic_asm.h
index 2c3ba1945a8b2c40c4695937f514e3c66df7d4c7..728c506845c7aad36300e8e6e58499d5f6fa85f0 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_asm.h
+++ b/open-vm-tools/lib/include/vm_basic_asm.h
@@ -71,6 +71,9 @@
 #include "mul64.h"
 #elif defined VM_ARM_64
 #include "vm_basic_asm_arm64.h"
+#ifdef VMKERNEL
+#include "vmk_arm_mode.h"
+#endif
 #else
 #define MUL64_NO_ASM 1
 #include "mul64.h"
@@ -765,8 +768,8 @@ RDTSC(void)
     * bora/lib/vprobe/arm64/vp_emit_tc.c::VpEmit_BuiltinRDTSCWork()
     * bora/modules/vmkernel/tests/core/xmapTest/xmapTest_arm64.c::XMapTest_SetupLoopCode()
     */
-#if defined(VMKERNEL) && !defined(VMK_ARM_EL1_OR_VHE)
-   return MRS(CNTPCT_EL0);
+#ifdef VMKERNEL
+   return MRSx(VMK_CNT_CT_EL);
 #else
    return MRS(CNTVCT_EL0);
 #endif