ARM: allow unwinder to unwind recursive functions

Allow the unwinder to unwind recursive functions if the stack makes
progress, even if the PC is the same. This allows tracing through
recursive __switchdev_handle_port_attr_set() and similar.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
index 4574e6aea0a528836641acd95a9f16377616716a..11a964fd66f474b7090a45cf8f65938c65bd12d2 100644 (file)
--- a/arch/arm/kernel/unwind.c
+++ b/arch/arm/kernel/unwind.c
@@ -444,7 +444,7 @@ int unwind_frame(struct stackframe *frame)
                ctrl.vrs[PC] = ctrl.vrs[LR];
 
        /* check for infinite loop */
-       if (frame->pc == ctrl.vrs[PC])
+       if (frame->pc == ctrl.vrs[PC] && frame->sp == ctrl.vrs[SP])
                return -URC_FAILURE;
 
        frame->fp = ctrl.vrs[FP];