Re: [Xen-devel] [PATCH v2] arm64: xen: Use modern annotations for assembly functions

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Thu, 19 Dec 2019, Mark Brown wrote:
> In an effort to clarify and simplify the annotation of assembly functions
> in the kernel new macros have been introduced. These replace ENTRY and
> ENDPROC. Update the annotations in the xen code to the new macros.
> 
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
> Reviewed-by: Julien Grall <julien@xxxxxxx>
> Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>

Thank you!

> ---
>  arch/arm64/xen/hypercall.S | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S
> index c5f05c4a4d00..5b09aca55108 100644
> --- a/arch/arm64/xen/hypercall.S
> +++ b/arch/arm64/xen/hypercall.S
> @@ -56,11 +56,11 @@
>  #define XEN_IMM 0xEA1
>  
>  #define HYPERCALL_SIMPLE(hypercall)          \
> -ENTRY(HYPERVISOR_##hypercall)                        \
> +SYM_FUNC_START(HYPERVISOR_##hypercall)               \
>       mov x16, #__HYPERVISOR_##hypercall;     \
>       hvc XEN_IMM;                            \
>       ret;                                    \
> -ENDPROC(HYPERVISOR_##hypercall)
> +SYM_FUNC_END(HYPERVISOR_##hypercall)
>  
>  #define HYPERCALL0 HYPERCALL_SIMPLE
>  #define HYPERCALL1 HYPERCALL_SIMPLE
> @@ -86,7 +86,7 @@ HYPERCALL2(multicall);
>  HYPERCALL2(vm_assist);
>  HYPERCALL3(dm_op);
>  
> -ENTRY(privcmd_call)
> +SYM_FUNC_START(privcmd_call)
>       mov x16, x0
>       mov x0, x1
>       mov x1, x2
> @@ -109,4 +109,4 @@ ENTRY(privcmd_call)
>        */
>       uaccess_ttbr0_disable x6, x7
>       ret
> -ENDPROC(privcmd_call);
> +SYM_FUNC_END(privcmd_call);
> -- 
> 2.20.1
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel