2 files changed, 5 insertions, 1 deletions

diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 1420725142ca..efb208de75ec 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -132,6 +132,10 @@
         orrne   r5, V7M_xPSR_FRAMEPTRALIGN
         biceq   r5, V7M_xPSR_FRAMEPTRALIGN
 
+        @ ensure bit 0 is cleared in the PC, otherwise behaviour is
+        @ unpredictable
+        bic     r4, #1
+
         @ write basic exception frame
         stmdb   r2!, {r1, r3-r5}
         ldmia   sp, {r1, r3-r5}
diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
index 3c217694ebec..cb791ac6a003 100644
--- a/arch/arm/kernel/unwind.c
+++ b/arch/arm/kernel/unwind.c
@@ -285,7 +285,7 @@ static int unwind_exec_pop_r4_to_rN(struct unwind_ctrl_block *ctrl,
                 if (unwind_pop_register(ctrl, &vsp, reg))
                                 return -URC_FAILURE;
 
-        if (insn & 0x80)
+        if (insn & 0x8)
                 if (unwind_pop_register(ctrl, &vsp, 14))
                                 return -URC_FAILURE;