Patchwork [05/10] PPC: booke206: allow NULL raddr in ppcmas_tlb_check

login
register
mail settings
Submitter Alexander Graf
Date Jan. 25, 2012, 5:27 p.m.
Message ID <1327512458-28550-6-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/137814/
State New
Headers show

Comments

Alexander Graf - Jan. 25, 2012, 5:27 p.m.
We might want to call the tlb check function without actually caring about
the real address resolution. Check if we really should write the value
back.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 target-ppc/helper.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

Patch

diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 5847453..2ce2d92 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -1338,7 +1338,10 @@  int ppcmas_tlb_check(CPUState *env, ppcmas_tlb_t *tlb,
     if ((address & mask) != (tlb->mas2 & MAS2_EPN_MASK)) {
         return -1;
     }
-    *raddrp = (tlb->mas7_3 & mask) | (address & ~mask);
+
+    if (raddrp) {
+        *raddrp = (tlb->mas7_3 & mask) | (address & ~mask);
+    }
 
     return 0;
 }