Message ID | 20230206121714.85084-5-philmd@linaro.org |
---|---|
State | New |
Headers | show |
Series | target/arm: Housekeeping around NVIC | expand |
On 2/6/23 02:17, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > target/arm/cpu.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index bbbcf2e153..01d478e9ce 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -770,9 +770,10 @@ typedef struct CPUArchState { > #if defined(CONFIG_USER_ONLY) > /* For usermode syscall translation. */ > int eabi; > +#else > + const struct arm_boot_info *boot_info; > #endif > void *nvic; > - const struct arm_boot_info *boot_info; > /* Store GICv3CPUState to access from this struct */ > void *gicv3state; > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/arm/cpu.h b/target/arm/cpu.h index bbbcf2e153..01d478e9ce 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -770,9 +770,10 @@ typedef struct CPUArchState { #if defined(CONFIG_USER_ONLY) /* For usermode syscall translation. */ int eabi; +#else + const struct arm_boot_info *boot_info; #endif void *nvic; - const struct arm_boot_info *boot_info; /* Store GICv3CPUState to access from this struct */ void *gicv3state;
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/arm/cpu.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)