From: Kruti Pendharkar Date: Tue, 18 Feb 2025 09:13:55 +0000 (-0800) Subject: Change to common header file not applicable to open-vm-tools. X-Git-Tag: stable-13.1.0~232 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec922a95c5a10f31ca7db4f1690dd7bb24d44f68;p=thirdparty%2Fopen-vm-tools.git 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 a4dd1de97..b0cd412c4 100644 --- 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)