Module Name: src
Committed By: ryo
Date: Mon Jul 27 07:32:48 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: trap.c
Log Message:
fix build error. need cast.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/aarch64/aarch64/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/trap.c
diff -u src/sys/arch/aarch64/aarch64/trap.c:1.33 src/sys/arch/aarch64/aarch64/trap.c:1.34
--- src/sys/arch/aarch64/aarch64/trap.c:1.33 Sun Jul 26 07:26:52 2020
+++ src/sys/arch/aarch64/aarch64/trap.c Mon Jul 27 07:32:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.33 2020/07/26 07:26:52 ryo Exp $ */
+/* $NetBSD: trap.c,v 1.34 2020/07/27 07:32:48 ryo Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.33 2020/07/26 07:26:52 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.34 2020/07/27 07:32:48 ryo Exp $");
#include "opt_arm_intr_impl.h"
#include "opt_compat_netbsd32.h"
@@ -615,10 +615,10 @@ emul_arm_swp(uint32_t insn, struct trapf
if ((error = cpu_set_onfault(&fb)) == 0) {
if (insn & 0x00400000) {
/* swpb */
- val = atomic_swap_8(vaddr, val);
+ val = atomic_swap_8((uint8_t *)vaddr, val);
} else {
/* swp */
- val = atomic_swap_32(vaddr, val);
+ val = atomic_swap_32((uint32_t *)vaddr, val);
}
cpu_unset_onfault();
tf->tf_reg[Rd] = val;
