| Message ID | 20181018132109.31192-5-julien.grall@arm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xen/arm: Bunch of clean-ups | expand |
On 18.10.18 16:20, Julien Grall wrote: > do_bug_frame is only necessary when trapping. This allows to remove > processor.h include. > > However, time.h was missing an include resulting to compilation error if > processor.h is removed from bug.h. > > Signed-off-by: Julien Grall <julien.grall@arm.com> > --- > xen/arch/arm/arm32/traps.c | 1 + > xen/include/asm-arm/bug.h | 4 ---- > xen/include/asm-arm/time.h | 2 ++ > xen/include/asm-arm/traps.h | 2 ++ > 4 files changed, 5 insertions(+), 4 deletions(-) Reviewed-by: Andrii Anisov <andrii_anisov@epam.com> -- *Andrii Anisov*
diff --git a/xen/arch/arm/arm32/traps.c b/xen/arch/arm/arm32/traps.c index 4f27543dec..76f714a168 100644 --- a/xen/arch/arm/arm32/traps.c +++ b/xen/arch/arm/arm32/traps.c @@ -22,6 +22,7 @@ #include <public/xen.h> #include <asm/processor.h> +#include <asm/traps.h> void do_trap_reset(struct cpu_user_regs *regs) { diff --git a/xen/include/asm-arm/bug.h b/xen/include/asm-arm/bug.h index 4704e2d858..36c803357c 100644 --- a/xen/include/asm-arm/bug.h +++ b/xen/include/asm-arm/bug.h @@ -1,8 +1,6 @@ #ifndef __ARM_BUG_H__ #define __ARM_BUG_H__ -#include <asm/processor.h> - #if defined(CONFIG_ARM_32) # include <asm/arm32/bug.h> #elif defined(CONFIG_ARM_64) @@ -77,8 +75,6 @@ extern const struct bug_frame __start_bug_frames[], __stop_bug_frames_1[], __stop_bug_frames_2[]; -int do_bug_frame(struct cpu_user_regs *regs, vaddr_t pc); - #endif /* __ARM_BUG_H__ */ /* * Local variables: diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index 19a4515e72..ea88e76304 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -1,6 +1,8 @@ #ifndef __ARM_TIME_H__ #define __ARM_TIME_H__ +#include <asm/processor.h> + #define DT_MATCH_TIMER \ DT_MATCH_COMPATIBLE("arm,armv7-timer"), \ DT_MATCH_COMPATIBLE("arm,armv8-timer") diff --git a/xen/include/asm-arm/traps.h b/xen/include/asm-arm/traps.h index 70b52d1d16..059aa370c3 100644 --- a/xen/include/asm-arm/traps.h +++ b/xen/include/asm-arm/traps.h @@ -43,6 +43,8 @@ void do_cp(struct cpu_user_regs *regs, const union hsr hsr); void do_trap_smc(struct cpu_user_regs *regs, const union hsr hsr); void do_trap_hvc_smccc(struct cpu_user_regs *regs); +int do_bug_frame(struct cpu_user_regs *regs, vaddr_t pc); + #endif /* __ASM_ARM_TRAPS__ */ /* * Local variables:
do_bug_frame is only necessary when trapping. This allows to remove processor.h include. However, time.h was missing an include resulting to compilation error if processor.h is removed from bug.h. Signed-off-by: Julien Grall <julien.grall@arm.com> --- xen/arch/arm/arm32/traps.c | 1 + xen/include/asm-arm/bug.h | 4 ---- xen/include/asm-arm/time.h | 2 ++ xen/include/asm-arm/traps.h | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-)