diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2023-04-26 07:58:38 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2023-04-26 08:20:16 +0200 |
| commit | 0c993300d52bf5ce9b951c3b6b25d0d14acc49a9 (patch) | |
| tree | 1b89c34a0cb83642b63ac7a005a36184927674f7 /arch/powerpc | |
| parent | powerpc/configs/powernv: Add IGB=y (diff) | |
| download | linux-0c993300d52bf5ce9b951c3b6b25d0d14acc49a9.tar.xz linux-0c993300d52bf5ce9b951c3b6b25d0d14acc49a9.zip | |
powerpc: Fix merge conflict between pcrel and copy_thread changes
Fix a conflict between commit 4e991e3c16a35 ("powerpc: add CFUNC
assembly label annotation") and commit b504b6aade040 ("powerpc:
differentiate kthread from user kernel thread start").
Fixes: 4e991e3c16a35 ("powerpc: add CFUNC assembly label annotation")
Fixes: b504b6aade040 ("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
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/interrupt_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/interrupt_64.S b/arch/powerpc/kernel/interrupt_64.S index 6730d676284c..bd863702d812 100644 --- a/arch/powerpc/kernel/interrupt_64.S +++ b/arch/powerpc/kernel/interrupt_64.S @@ -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 |