Merge remote-tracking branch 'amit/master' into staging

[qemu.git] / target-cris / helper.c

diff --git a/target-cris/helper.c b/target-cris/helper.c
index 1bdb7e26b7969a88aca7be9a6af7291b60d8b450..324fe052f57ab2568467ac1446b57af4d2c6cb96 100644 (file)
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -246,7 +246,7 @@ void do_interrupt(CPUCRISState *env)
                   env->pregs[PR_ERP]);
 }
 
-target_phys_addr_t cpu_get_phys_page_debug(CPUCRISState * env, target_ulong addr)
+hwaddr cpu_get_phys_page_debug(CPUCRISState * env, target_ulong addr)
 {
        uint32_t phy = addr;
        struct cris_mmu_result res;