Skip to content

Commit b6a5c58

Browse files
brooniewilldeacon
authored andcommitted
arm64: xen: Use modern annotations for assembly functions
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 <[email protected]> Reviewed-by: Julien Grall <[email protected]> Reviewed-by: Stefano Stabellini <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent f7ef82c commit b6a5c58

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/arm64/xen/hypercall.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@
5656
#define XEN_IMM 0xEA1
5757

5858
#define HYPERCALL_SIMPLE(hypercall) \
59-
ENTRY(HYPERVISOR_##hypercall) \
59+
SYM_FUNC_START(HYPERVISOR_##hypercall) \
6060
mov x16, #__HYPERVISOR_##hypercall; \
6161
hvc XEN_IMM; \
6262
ret; \
63-
ENDPROC(HYPERVISOR_##hypercall)
63+
SYM_FUNC_END(HYPERVISOR_##hypercall)
6464

6565
#define HYPERCALL0 HYPERCALL_SIMPLE
6666
#define HYPERCALL1 HYPERCALL_SIMPLE
@@ -86,7 +86,7 @@ HYPERCALL2(multicall);
8686
HYPERCALL2(vm_assist);
8787
HYPERCALL3(dm_op);
8888

89-
ENTRY(privcmd_call)
89+
SYM_FUNC_START(privcmd_call)
9090
mov x16, x0
9191
mov x0, x1
9292
mov x1, x2
@@ -109,4 +109,4 @@ ENTRY(privcmd_call)
109109
*/
110110
uaccess_ttbr0_disable x6, x7
111111
ret
112-
ENDPROC(privcmd_call);
112+
SYM_FUNC_END(privcmd_call);

0 commit comments

Comments
 (0)