Common header file change 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 b1720ada39f30d8058eb5de47ba2086c0b02187d..2c3f75080d9cd098b7bd7455b898a0ea1cf3ead3 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_asm.h
+++ b/open-vm-tools/lib/include/vm_basic_asm.h
@@ -520,7 +520,7 @@ uint16set(void *dst, uint16 val, size_t count)
       "strh    %w2, [%0]\n"
       "4:"
       : "+r" (tmpDst), "+r" (count), "+r" (tmpVal)
-      : "r" (val)
+      : "r" ((uint64)val)
       : "cc", "memory");
 #else
    size_t dummy0;
@@ -573,6 +573,7 @@ uint32set(void *dst, uint32 val, size_t count)
       : "cc", "memory");
 #elif defined(VM_ARM_64)
    void   *tmpDst = dst;
+   uint64 tmpVal = val;
 
    if (count == 0) {
       return dst;
@@ -609,7 +610,7 @@ uint32set(void *dst, uint32 val, size_t count)
       "cbz     %1, 4f\n\t"
       "str     %w2, [%0]\n\t" // No incr
       "4:"
-      : "+r" (tmpDst), "+r" (count), "+r" (val)
+      : "+r" (tmpDst), "+r" (count), "+r" (tmpVal)
       :
       : "cc", "memory");
 #else