Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / arch / arm / oprofile / common.c

diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index 99c63d4b6af8ad2060ca6f7ed6b7972b9387ac30..cc649a1e46da27ae45488d743597edcc251430ff 100644 (file)
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -33,12 +33,14 @@ static struct op_perf_name {
        char *perf_name;
        char *op_name;
 } op_perf_name_map[] = {
-       { "xscale1",            "arm/xscale1"   },
-       { "xscale1",            "arm/xscale2"   },
-       { "v6",                 "arm/armv6"     },
-       { "v6mpcore",           "arm/mpcore"    },
-       { "ARMv7 Cortex-A8",    "arm/armv7"     },
-       { "ARMv7 Cortex-A9",    "arm/armv7-ca9" },
+       { "armv5_xscale1",      "arm/xscale1"   },
+       { "armv5_xscale2",      "arm/xscale2"   },
+       { "armv6_1136",         "arm/armv6"     },
+       { "armv6_1156",         "arm/armv6"     },
+       { "armv6_1176",         "arm/armv6"     },
+       { "armv6_11mpcore",     "arm/mpcore"    },
+       { "armv7_cortex_a8",    "arm/armv7"     },
+       { "armv7_cortex_a9",    "arm/armv7-ca9" },
 };
 
 char *op_name_from_perf_id(void)
@@ -107,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;
        }