aboutsummaryrefslogtreecommitdiff
path: root/target/arm
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2022-10-01 09:22:51 -0700
committerPeter Maydell <peter.maydell@linaro.org>2022-10-10 14:52:25 +0100
commit72cef09caa2ce23324777676979c62bbdd02cb35 (patch)
tree8ee3225cd29b52aedfcbb267ae507a0037aa3665 /target/arm
parentab1f78859dd711fed72b1aeb7e46e05b0273a017 (diff)
downloadqemu-72cef09caa2ce23324777676979c62bbdd02cb35.zip
qemu-72cef09caa2ce23324777676979c62bbdd02cb35.tar.gz
qemu-72cef09caa2ce23324777676979c62bbdd02cb35.tar.bz2
target/arm: Remove env argument from combined_attrs_fwb
This value is unused. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 20221001162318.153420-16-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/arm')
-rw-r--r--target/arm/ptw.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index b40b458..7d607c2 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -2172,8 +2172,7 @@ static uint8_t force_cacheattr_nibble_wb(uint8_t attr)
* s1 and s2 for the HCR_EL2.FWB == 1 case, returning the
* combined attributes in MAIR_EL1 format.
*/
-static uint8_t combined_attrs_fwb(CPUARMState *env,
- ARMCacheAttrs s1, ARMCacheAttrs s2)
+static uint8_t combined_attrs_fwb(ARMCacheAttrs s1, ARMCacheAttrs s2)
{
switch (s2.attrs) {
case 7:
@@ -2246,7 +2245,7 @@ static ARMCacheAttrs combine_cacheattrs(CPUARMState *env,
/* Combine memory type and cacheability attributes */
if (arm_hcr_el2_eff(env) & HCR_FWB) {
- ret.attrs = combined_attrs_fwb(env, s1, s2);
+ ret.attrs = combined_attrs_fwb(s1, s2);
} else {
ret.attrs = combined_attrs_nofwb(env, s1, s2);
}