Always allow backtrace when using oprofile on ARM, even if a PMU
isn't present.
Restores functionality originally introduced in
1b7b56982fdcd9d85effd76f3928cf5d6eb26155 by Richard Purdie.
Signed-off-by: Ari Kauppi <kauppi@xxxxxxxxxxxx>
Cc: Richard Purdie <rpurdie@xxxxxxxxx>
Cc: Will Deacon <will.deacon@xxxxxxx>
Cc: Matt Fleming <matt@xxxxxxxxxxxxxxxxx>
---
arch/arm/oprofile/common.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index 8aa9744..a23e5ae 100644
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -46,6 +46,7 @@ char *op_name_from_perf_id(void)
return NULL;
}
}
+#endif
static int report_trace(struct stackframe *frame, void *d)
{
@@ -109,6 +110,7 @@ static void arm_backtrace(struct pt_regs * const regs, unsigned int depth)
tail = user_backtrace(tail);
}
+#ifdef CONFIG_HW_PERF_EVENTS
int __init oprofile_arch_init(struct oprofile_operations *ops)
{
ops->backtrace = arm_backtrace;
@@ -124,6 +126,8 @@ void __exit oprofile_arch_exit(void)
int __init oprofile_arch_init(struct oprofile_operations *ops)
{
pr_info("oprofile: hardware counters not available\n");
+ ops->backtrace = arm_backtrace;
+
return -ENODEV;
}
void __exit oprofile_arch_exit(void) {}
--
1.7.4.rc2.3.g60a2e
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
