Commit 0c993300 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman

powerpc: Fix merge conflict between pcrel and copy_thread changes

Fix a conflict between commit 4e991e3c ("powerpc: add CFUNC
assembly label annotation") and commit b504b6aa ("powerpc:
differentiate kthread from user kernel thread start").

Fixes: 4e991e3c ("powerpc: add CFUNC assembly label annotation")
Fixes: b504b6aa ("powerpc: differentiate kthread from user kernel thread start")
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230426055848.402993-2-npiggin@gmail.com
parent 836a3de6
......@@ -756,7 +756,7 @@ _GLOBAL(ret_from_kernel_user_thread)
b .Lsyscall_exit
_GLOBAL(start_kernel_thread)
bl schedule_tail
bl CFUNC(schedule_tail)
mtctr r14
mr r3,r15
#ifdef CONFIG_PPC64_ELF_ABI_V2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment