aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target-cris/mmu.c6
-rw-r--r--target-cris/mmu.h1
2 files changed, 1 insertions, 6 deletions
diff --git a/target-cris/mmu.c b/target-cris/mmu.c
index f270d5b8fc..408a99c72c 100644
--- a/target-cris/mmu.c
+++ b/target-cris/mmu.c
@@ -285,7 +285,7 @@ static int cris_mmu_translate_page(struct cris_mmu_result_t *res,
env->sregs[SFR_RW_MM_TLB_SEL],
env->regs[R_SP], env->pregs[PR_USP], env->ksp));
- res->pfn = tlb_pfn;
+ res->phy = tlb_pfn << TARGET_PAGE_BITS;
return !match;
}
@@ -360,11 +360,7 @@ int cris_mmu_translate(struct cris_mmu_result_t *res,
res->prot = PAGE_BITS;
}
else
- {
miss = cris_mmu_translate_page(res, env, vaddr, rw, is_user);
- phy = (res->pfn << 13);
- res->phy = phy;
- }
done:
env->pregs[PR_SRS] = old_srs;
return miss;
diff --git a/target-cris/mmu.h b/target-cris/mmu.h
index 5a1f92d594..1b9aff15bc 100644
--- a/target-cris/mmu.h
+++ b/target-cris/mmu.h
@@ -6,7 +6,6 @@
struct cris_mmu_result_t
{
uint32_t phy;
- uint32_t pfn;
int prot;
int bf_vec;
};