| Message ID | 20191204232058.2500117-2-pasha.tatashin@soleen.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Use C inlines for uaccess | expand |
Hi, On 04/12/2019 23:20, 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. > > Also fix a comment. > > Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com> > --- > arch/arm/include/asm/assembler.h | 2 +- > arch/arm/include/asm/xen/hypercall.h | 4 ++++ > arch/arm64/include/asm/xen/hypercall.h | 4 ++++ > include/xen/arm/hypercall.h | 6 +++--- > 4 files changed, 12 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h > index 99929122dad7..8e9262a0f016 100644 > --- a/arch/arm/include/asm/assembler.h > +++ b/arch/arm/include/asm/assembler.h > @@ -480,7 +480,7 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) > .macro uaccess_disable, tmp, isb=1 > #ifdef CONFIG_CPU_SW_DOMAIN_PAN > /* > - * Whenever we re-enter userspace, the domains should always be > + * Whenever we re-enter kernel, the domains should always be This feels unrelated from the rest of the patch and probably want an explanation. So I think this want to be in a separate patch. The rest of the patch looks good to me. Cheers,
> > /* > > - * Whenever we re-enter userspace, the domains should always be > > + * Whenever we re-enter kernel, the domains should always be > > This feels unrelated from the rest of the patch and probably want an > explanation. So I think this want to be in a separate patch. I will simply remove this comment fix, since I do not change anything else in this file anymore. > The rest of the patch looks good to me. Thank you Julien. > > Cheers, > > -- > Julien Grall
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 99929122dad7..8e9262a0f016 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -480,7 +480,7 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) .macro uaccess_disable, tmp, isb=1 #ifdef CONFIG_CPU_SW_DOMAIN_PAN /* - * Whenever we re-enter userspace, the domains should always be + * Whenever we re-enter kernel, the domains should always be * set appropriately. */ mov \tmp, #DACR_UACCESS_DISABLE 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 */
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. Also fix a comment. Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com> --- arch/arm/include/asm/assembler.h | 2 +- arch/arm/include/asm/xen/hypercall.h | 4 ++++ arch/arm64/include/asm/xen/hypercall.h | 4 ++++ include/xen/arm/hypercall.h | 6 +++--- 4 files changed, 12 insertions(+), 4 deletions(-)