Merge branch 'devel-stable' into for-next

[cascardo/linux.git] / arch / arm / oprofile / common.c

diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index 6826e35..cc649a1 100644 (file)
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -109,10 +109,7 @@ static void arm_backtrace(struct pt_regs * const regs, unsigned int depth)
 
        if (!user_mode(regs)) {
                struct stackframe frame;
-               frame.fp = regs->ARM_fp;
-               frame.sp = regs->ARM_sp;
-               frame.lr = regs->ARM_lr;
-               frame.pc = regs->ARM_pc;
+               arm_get_current_stackframe(regs, &frame);
                walk_stackframe(&frame, report_trace, &depth);
                return;
        }