1 files changed, 9 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 96dce6a4b61e..b61cfd29c76f 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -730,6 +730,9 @@ fast_exception_return:
         mtcr    r10
         lwz     r10,_LINK(r11)
         mtlr    r10
+        /* Clear the exception_marker on the stack to avoid confusing stacktrace */
+        li      r10, 0
+        stw     r10, 8(r11)
         REST_GPR(10, r11)
 #if defined(CONFIG_PPC_8xx) && defined(CONFIG_PERF_EVENTS)
         mtspr   SPRN_NRI, r0
@@ -961,6 +964,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
         mtcrf   0xFF,r10
         mtlr    r11
 
+        /* Clear the exception_marker on the stack to avoid confusing stacktrace */
+        li      r10, 0
+        stw     r10, 8(r1)
         /*
          * Once we put values in SRR0 and SRR1, we are in a state
          * where exceptions are not recoverable, since taking an
@@ -997,6 +1003,9 @@ exc_exit_restart_end:
         mtlr    r11
         lwz     r10,_CCR(r1)
         mtcrf   0xff,r10
+        /* Clear the exception_marker on the stack to avoid confusing stacktrace */
+        li      r10, 0
+        stw     r10, 8(r1)
         REST_2GPRS(9, r1)
         .globl exc_exit_restart
 exc_exit_restart: