On 6/4/21 8:52 AM, Alex Bennée wrote: > From: Claudio Fontana <cfontana@suse.de> > > after moving the code of fp_exception_el to a sysemu-only module, > we can remove the #ifndef CONFIG_USER_ONLY. > > Signed-off-by: Claudio Fontana <cfontana@suse.de> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > target/arm/cpu-sysemu.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/target/arm/cpu-sysemu.c b/target/arm/cpu-sysemu.c > index 128616d90d..0d80a0161c 100644 > --- a/target/arm/cpu-sysemu.c > +++ b/target/arm/cpu-sysemu.c > @@ -417,7 +417,6 @@ int sve_exception_el(CPUARMState *env, int el) > */ > int fp_exception_el(CPUARMState *env, int cur_el) > { > -#ifndef CONFIG_USER_ONLY > /* > * CPACR and the CPTR registers don't exist before v6, so FP is > * always accessible > @@ -507,6 +506,5 @@ int fp_exception_el(CPUARMState *env, int cur_el) > /* Trap all FP ops to EL3 */ > return 3; > } > -#endif > return 0; > } Ah, squash with previous. Just like was done in patch 45 with sve_exception_el while moving. r~
diff --git a/target/arm/cpu-sysemu.c b/target/arm/cpu-sysemu.c index 128616d90d..0d80a0161c 100644 --- a/target/arm/cpu-sysemu.c +++ b/target/arm/cpu-sysemu.c @@ -417,7 +417,6 @@ int sve_exception_el(CPUARMState *env, int el) */ int fp_exception_el(CPUARMState *env, int cur_el) { -#ifndef CONFIG_USER_ONLY /* * CPACR and the CPTR registers don't exist before v6, so FP is * always accessible @@ -507,6 +506,5 @@ int fp_exception_el(CPUARMState *env, int cur_el) /* Trap all FP ops to EL3 */ return 3; } -#endif return 0; }