From: Jamie Iles <jamie@jamieiles.com>
Date: Thu, 23 Jun 2011 01:12:59 +0000 (+0000)
Subject: target-arm: make VMSAv7 remapping and AP dependent on V6K
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0ab06d8347bd825090e220167da017d67112e846;p=qemu.git

target-arm: make VMSAv7 remapping and AP dependent on V6K

The VMSAv7 remapping and access permissions were introduced in ARMv6K
and not ARMv7.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target-arm/helper.c b/target-arm/helper.c
index ae4f334e40..4b03197a18 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -948,7 +948,7 @@ static inline int check_ap(CPUState *env, int ap, int domain, int access_type,
   case 6:
       return prot_ro;
   case 7:
-      if (!arm_feature (env, ARM_FEATURE_V7))
+      if (!arm_feature (env, ARM_FEATURE_V6K))
           return 0;
       return prot_ro;
   default: