summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/idle_6xx.S
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@csgroup.eu>2021-03-12 13:50:45 +0100
committerMichael Ellerman <mpe@ellerman.id.au>2021-03-29 04:22:10 +0200
commita5d33be0512b4565808a3aed05567cb56c0e6ad0 (patch)
tree33709b84eaf2247e7346f63a3d53de651466fe56 /arch/powerpc/kernel/idle_6xx.S
parentpowerpc/32: Save remaining registers in exception prolog (diff)
downloadlinux-a5d33be0512b4565808a3aed05567cb56c0e6ad0.tar.xz
linux-a5d33be0512b4565808a3aed05567cb56c0e6ad0.zip
powerpc/32: Return directly from power_save_ppc32_restore()
transfer_to_handler_cont: is now just a blr. Directly perform blr in power_save_ppc32_restore(). Also remove useless setting of r11 in e500 version of power_save_ppc32_restore(). Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/e337506e08a4df95b11d2290104b92f0dcdb5548.1615552867.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc/kernel/idle_6xx.S')
-rw-r--r--arch/powerpc/kernel/idle_6xx.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/idle_6xx.S b/arch/powerpc/kernel/idle_6xx.S
index 153366e178c4..13cad9297d82 100644
--- a/arch/powerpc/kernel/idle_6xx.S
+++ b/arch/powerpc/kernel/idle_6xx.S
@@ -176,7 +176,7 @@ BEGIN_FTR_SECTION
lwz r9,nap_save_hid1@l(r9)
mtspr SPRN_HID1, r9
END_FTR_SECTION_IFSET(CPU_FTR_DUAL_PLL_750FX)
- b transfer_to_handler_cont
+ blr
_ASM_NOKPROBE_SYMBOL(power_save_ppc32_restore)
.data