mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

powerpc: Fix merge conflict between pcrel and copy_thread changes

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

Fixes: 4e991e3c16 ("powerpc: add CFUNC assembly label annotation")
Fixes: b504b6aade ("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
This commit is contained in:
Nicholas Piggin 2023-04-26 15:58:38 +10:00 committed by Michael Ellerman
parent 836a3de6b2
commit 0c993300d5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/kernel/interrupt_64.S
View file

@ -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