diff options
author | Mark Brown <broonie@kernel.org> | 2020-02-18 19:58:28 +0000 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2020-03-09 17:35:08 +0000 |
commit | c3357fc5415d6e0c45c7c8987e06cf8f8b3f3a54 (patch) | |
tree | 0c75ad1c980939ced79d57c9eca0c47b1fcbd459 /arch/arm64/kernel/entry.S | |
parent | 0ccbd98a92c19a34921adb082cd00c58e134ba02 (diff) | |
download | lwn-c3357fc5415d6e0c45c7c8987e06cf8f8b3f3a54.tar.gz lwn-c3357fc5415d6e0c45c7c8987e06cf8f8b3f3a54.zip |
arm64: entry: Annotate ret_from_fork as code
In an effort to clarify and simplify the annotation of assembly
functions new macros have been introduced. These replace ENTRY and
ENDPROC with two different annotations for normal functions and those
with unusual calling conventions.
ret_from_fork is not a normal C function and should therefore be
annotated as code.
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/entry.S')
-rw-r--r-- | arch/arm64/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 1454f3ea2e2e..d535cb8a7413 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -902,14 +902,14 @@ NOKPROBE(cpu_switch_to) /* * This is how we return from a fork. */ -ENTRY(ret_from_fork) +SYM_CODE_START(ret_from_fork) bl schedule_tail cbz x19, 1f // not a kernel thread mov x0, x20 blr x19 1: get_current_task tsk b ret_to_user -ENDPROC(ret_from_fork) +SYM_CODE_END(ret_from_fork) NOKPROBE(ret_from_fork) #ifdef CONFIG_ARM_SDE_INTERFACE |