From: Nicholas Piggin <npiggin@gmail.com>
Date: Fri, 11 Aug 2017 16:39:05 +0000 (+1000)
Subject: powerpc/64: Remove redundant instruction in interrupt replay
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ccd5eb837c4dc4012023b723e84a6531b5c4bbac;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

powerpc/64: Remove redundant instruction in interrupt replay

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---

diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index e7bff7f9d08f..55e9d03b5de9 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -971,7 +971,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
 	bne	1f
 	addi	r3,r1,STACK_FRAME_OVERHEAD;
 	bl	doorbell_exception
-	b	ret_from_except
 #endif /* CONFIG_PPC_DOORBELL */
 1:	b	ret_from_except /* What else to do here ? */