Skip to content

Commit 0c99330

Browse files
npigginmpe
authored andcommitted
powerpc: Fix merge conflict between pcrel and copy_thread changes
Fix a conflict between commit 4e991e3 ("powerpc: add CFUNC assembly label annotation") and commit b504b6a ("powerpc: differentiate kthread from user kernel thread start"). Fixes: 4e991e3 ("powerpc: add CFUNC assembly label annotation") Fixes: b504b6a ("powerpc: differentiate kthread from user kernel thread start") Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20230426055848.402993-2-npiggin@gmail.com
1 parent 836a3de commit 0c99330

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/powerpc/kernel/interrupt_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ _GLOBAL(ret_from_kernel_user_thread)
756756
b .Lsyscall_exit
757757

758758
_GLOBAL(start_kernel_thread)
759-
bl schedule_tail
759+
bl CFUNC(schedule_tail)
760760
mtctr r14
761761
mr r3,r15
762762
#ifdef CONFIG_PPC64_ELF_ABI_V2

0 commit comments

Comments
 (0)