| Message ID | 20170912103622.18562-3-julien.grall@arm.com |
|---|---|
| State | Accepted |
| Commit | 082fc63f20e827eb0229d520b4ebf54140d9b21b |
| Headers | show |
| Series | xen/arm: Clean-up traps.c | expand |
On Tue, 12 Sep 2017, Julien Grall wrote: > It will be necessary to include vtimer.h from subdirectory making the > inclusion a bit awkward. > > Signed-off-by: Julien Grall <julien.grall@arm.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > xen/arch/arm/domain.c | 2 +- > xen/arch/arm/traps.c | 2 +- > xen/{arch/arm => include/asm-arm}/vtimer.h | 0 > 3 files changed, 2 insertions(+), 2 deletions(-) > rename xen/{arch/arm => include/asm-arm}/vtimer.h (100%) > > diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c > index 6512f01463..784ae392cf 100644 > --- a/xen/arch/arm/domain.c > +++ b/xen/arch/arm/domain.c > @@ -33,8 +33,8 @@ > #include <asm/regs.h> > #include <asm/vfp.h> > #include <asm/vgic.h> > +#include <asm/vtimer.h> > > -#include "vtimer.h" > #include "vuart.h" > > DEFINE_PER_CPU(struct vcpu *, curr_vcpu); > diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c > index 6b3dfd9bcf..6f32f700e5 100644 > --- a/xen/arch/arm/traps.c > +++ b/xen/arch/arm/traps.c > @@ -50,9 +50,9 @@ > #include <asm/psci.h> > #include <asm/regs.h> > #include <asm/vgic.h> > +#include <asm/vtimer.h> > > #include "decode.h" > -#include "vtimer.h" > > /* The base of the stack must always be double-word aligned, which means > * that both the kernel half of struct cpu_user_regs (which is pushed in > diff --git a/xen/arch/arm/vtimer.h b/xen/include/asm-arm/vtimer.h > similarity index 100% > rename from xen/arch/arm/vtimer.h > rename to xen/include/asm-arm/vtimer.h > -- > 2.11.0 >
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 6512f01463..784ae392cf 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -33,8 +33,8 @@ #include <asm/regs.h> #include <asm/vfp.h> #include <asm/vgic.h> +#include <asm/vtimer.h> -#include "vtimer.h" #include "vuart.h" DEFINE_PER_CPU(struct vcpu *, curr_vcpu); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 6b3dfd9bcf..6f32f700e5 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -50,9 +50,9 @@ #include <asm/psci.h> #include <asm/regs.h> #include <asm/vgic.h> +#include <asm/vtimer.h> #include "decode.h" -#include "vtimer.h" /* The base of the stack must always be double-word aligned, which means * that both the kernel half of struct cpu_user_regs (which is pushed in diff --git a/xen/arch/arm/vtimer.h b/xen/include/asm-arm/vtimer.h similarity index 100% rename from xen/arch/arm/vtimer.h rename to xen/include/asm-arm/vtimer.h
It will be necessary to include vtimer.h from subdirectory making the inclusion a bit awkward. Signed-off-by: Julien Grall <julien.grall@arm.com> --- xen/arch/arm/domain.c | 2 +- xen/arch/arm/traps.c | 2 +- xen/{arch/arm => include/asm-arm}/vtimer.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename xen/{arch/arm => include/asm-arm}/vtimer.h (100%)