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

diff --git a/open-vm-tools/lib/include/vm_basic_asm_arm64.h b/open-vm-tools/lib/include/vm_basic_asm_arm64.h
index a4dd1de9741f3e46150586e96ff24afd66924f2d..b0cd412c4ceecc27c4b9bc1b467a6da3ab68fb5d 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_asm_arm64.h
+++ b/open-vm-tools/lib/include/vm_basic_asm_arm64.h
@@ -385,8 +385,7 @@ GET_CURRENT_PC(void)
    if (CONC(VMK_ARM_NVSIM_, name) == 0) {                                     \
       asm volatile ("mrs %0, " XSTR(name) : "=r" (val) :: "memory");          \
    } else if (CONC(VMK_ARM_NVSIM_, name) == 1) {                              \
-      asm volatile (".balign 8"   "\n\t"                                      \
-                    "hvc #0x4e56" "\n\t"                                      \
+      asm volatile (VMK_ARM_NVSIM_HVC                                         \
                     "mrs %0, " XSTR(name) : "=r" (val) :: "memory");          \
    } else if (CONC(VMK_ARM_NVSIM_, name) == 2) {                              \
       val = 2 << 2 /* CURRENTEL_EL_2 */;                                      \
@@ -424,8 +423,7 @@ GET_CURRENT_PC(void)
    if (CONC(VMK_ARM_NVSIM_, name) == 0) {                                     \
       asm volatile ("msr " XSTR(name) ", %0" :: "r" (val) : "memory");        \
    } else if (CONC(VMK_ARM_NVSIM_, name) == 1) {                              \
-      asm volatile (".balign 8"   "\n\t"                                      \
-                    "hvc #0x4e56" "\n\t"                                      \
+      asm volatile (VMK_ARM_NVSIM_HVC                                         \
                     "msr " XSTR(name) ", %0" :: "r" (val) : "memory");        \
    }                                                                          \
 } while (0)