summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/helper.c4
-rw-r--r--target-arm/op_helper.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 701629af3..7a61c1c0e 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -520,7 +520,7 @@ void HELPER(clrex)(CPUState *env)
flush_mmon(env->mmon_entry->addr);
}
-target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
+a_target_phys_addr cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
{
return addr;
}
@@ -1230,7 +1230,7 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address,
return 1;
}
-target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
+a_target_phys_addr cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
{
uint32_t phys_addr;
int prot;
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index d4ae4ae7e..24382a060 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -30,7 +30,7 @@ void raise_exception(int tt)
/* thread support */
-static spinlock_t global_cpu_lock = SPIN_LOCK_UNLOCKED;
+static a_spinlock global_cpu_lock = SPIN_LOCK_UNLOCKED;
void cpu_lock(void)
{