| Message ID | 20200102211357.8042-2-pasha.tatashin@soleen.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v5,1/6] arm/arm64/xen: hypercall.h add includes guards | expand |
On Thu, 2 Jan 2020, Pavel Tatashin wrote: > The arm and arm64 versions of hypercall.h are missing the include > guards. This is needed because C inlines for privcmd_call are going to > be added to the files. > > Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com> > Reviewed-by: Julien Grall <julien@xen.org> Acked-by: Stefano Stabellini <sstabellini@kernel.org> > --- > arch/arm/include/asm/xen/hypercall.h | 4 ++++ > arch/arm64/include/asm/xen/hypercall.h | 4 ++++ > include/xen/arm/hypercall.h | 6 +++--- > 3 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/include/asm/xen/hypercall.h b/arch/arm/include/asm/xen/hypercall.h > index 3522cbaed316..c6882bba5284 100644 > --- a/arch/arm/include/asm/xen/hypercall.h > +++ b/arch/arm/include/asm/xen/hypercall.h > @@ -1 +1,5 @@ > +#ifndef _ASM_ARM_XEN_HYPERCALL_H > +#define _ASM_ARM_XEN_HYPERCALL_H > #include <xen/arm/hypercall.h> > + > +#endif /* _ASM_ARM_XEN_HYPERCALL_H */ > diff --git a/arch/arm64/include/asm/xen/hypercall.h b/arch/arm64/include/asm/xen/hypercall.h > index 3522cbaed316..c3198f9ccd2e 100644 > --- a/arch/arm64/include/asm/xen/hypercall.h > +++ b/arch/arm64/include/asm/xen/hypercall.h > @@ -1 +1,5 @@ > +#ifndef _ASM_ARM64_XEN_HYPERCALL_H > +#define _ASM_ARM64_XEN_HYPERCALL_H > #include <xen/arm/hypercall.h> > + > +#endif /* _ASM_ARM64_XEN_HYPERCALL_H */ > diff --git a/include/xen/arm/hypercall.h b/include/xen/arm/hypercall.h > index b40485e54d80..babcc08af965 100644 > --- a/include/xen/arm/hypercall.h > +++ b/include/xen/arm/hypercall.h > @@ -30,8 +30,8 @@ > * IN THE SOFTWARE. > */ > > -#ifndef _ASM_ARM_XEN_HYPERCALL_H > -#define _ASM_ARM_XEN_HYPERCALL_H > +#ifndef _ARM_XEN_HYPERCALL_H > +#define _ARM_XEN_HYPERCALL_H > > #include <linux/bug.h> > > @@ -88,4 +88,4 @@ MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req, > BUG(); > } > > -#endif /* _ASM_ARM_XEN_HYPERCALL_H */ > +#endif /* _ARM_XEN_HYPERCALL_H */ > -- > 2.17.1 >
On Mon, Jan 6, 2020 at 12:19 PM Stefano Stabellini <sstabellini@kernel.org> wrote: > > On Thu, 2 Jan 2020, Pavel Tatashin wrote: > > The arm and arm64 versions of hypercall.h are missing the include > > guards. This is needed because C inlines for privcmd_call are going to > > be added to the files. > > > > Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com> > > Reviewed-by: Julien Grall <julien@xen.org> > > Acked-by: Stefano Stabellini <sstabellini@kernel.org> Thank you, Pasha
diff --git a/arch/arm/include/asm/xen/hypercall.h b/arch/arm/include/asm/xen/hypercall.h index 3522cbaed316..c6882bba5284 100644 --- a/arch/arm/include/asm/xen/hypercall.h +++ b/arch/arm/include/asm/xen/hypercall.h @@ -1 +1,5 @@ +#ifndef _ASM_ARM_XEN_HYPERCALL_H +#define _ASM_ARM_XEN_HYPERCALL_H #include <xen/arm/hypercall.h> + +#endif /* _ASM_ARM_XEN_HYPERCALL_H */ diff --git a/arch/arm64/include/asm/xen/hypercall.h b/arch/arm64/include/asm/xen/hypercall.h index 3522cbaed316..c3198f9ccd2e 100644 --- a/arch/arm64/include/asm/xen/hypercall.h +++ b/arch/arm64/include/asm/xen/hypercall.h @@ -1 +1,5 @@ +#ifndef _ASM_ARM64_XEN_HYPERCALL_H +#define _ASM_ARM64_XEN_HYPERCALL_H #include <xen/arm/hypercall.h> + +#endif /* _ASM_ARM64_XEN_HYPERCALL_H */ diff --git a/include/xen/arm/hypercall.h b/include/xen/arm/hypercall.h index b40485e54d80..babcc08af965 100644 --- a/include/xen/arm/hypercall.h +++ b/include/xen/arm/hypercall.h @@ -30,8 +30,8 @@ * IN THE SOFTWARE. */ -#ifndef _ASM_ARM_XEN_HYPERCALL_H -#define _ASM_ARM_XEN_HYPERCALL_H +#ifndef _ARM_XEN_HYPERCALL_H +#define _ARM_XEN_HYPERCALL_H #include <linux/bug.h> @@ -88,4 +88,4 @@ MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req, BUG(); } -#endif /* _ASM_ARM_XEN_HYPERCALL_H */ +#endif /* _ARM_XEN_HYPERCALL_H */