Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/arch/aarch64.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@

#define COMPARE_AND_SWAP_64(addr, old_val, new_val) \
({ \
int result, read_val; \
int result; \
uintptr_t read_val; \
__asm__ __volatile__ (" \
1: ldaxr %2, %1\n \
cmp %2, %3\n \
Expand All @@ -46,7 +47,7 @@
b.ne 1b\n \
2: cset %w0, eq" \
: "=&r" (result), "+Q" (*addr), "=&r" (read_val) \
: "r" (old_val), "r" (new_val) \
: "r" ((uintptr_t)(old_val)), "r" ((uintptr_t)(new_val)) \
: "cc"); \
result; \
})
Expand Down Expand Up @@ -87,7 +88,7 @@
__asm__ __volatile__ (" \
stlr %1, %0" \
: "=Q" (*addr) \
: "r" (value) \
: "r" ((uintptr_t)(value)) \
: "cc"); \
})

Expand Down
2 changes: 1 addition & 1 deletion src/os/linux/aarch64/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ unsigned char aarch64_instruction_cache_line_len;
uintptr_t aarch64_instruction_cache_line_mask;

void initialisePlatform() {
unsigned int cache_type;
unsigned long cache_type;

/* Extract information from the cache-type register, which describes aspects
of the host's cache configuration */
Expand Down