Message ID | 1434389098-13430-20-git-send-email-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show |
diff --git a/target-arm/helper.c b/target-arm/helper.c index d46db91..c8cb970 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3193,7 +3193,8 @@ void register_cp_regs_for_features(ARMCPU *cpu) if (arm_feature(env, ARM_FEATURE_V6K)) { define_arm_cp_regs(cpu, v6k_cp_reginfo); } - if (arm_feature(env, ARM_FEATURE_V7MP)) { + if (arm_feature(env, ARM_FEATURE_V7MP) && + !arm_feature(env, ARM_FEATURE_MPU)) { define_arm_cp_regs(cpu, v7mp_cp_reginfo); } if (arm_feature(env, ARM_FEATURE_V7)) {