diff --git a/[refs] b/[refs] index e9a5af1cfb1f..92caa7865671 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1ba71f7645696020864fe3cea3049befbe50408 +refs/heads/master: 7c842470f3ec7457585c277b9c5f535e94796f59 diff --git a/trunk/arch/sh/oprofile/common.c b/trunk/arch/sh/oprofile/common.c index 84533142da9b..b4c2d2b946dd 100644 --- a/trunk/arch/sh/oprofile/common.c +++ b/trunk/arch/sh/oprofile/common.c @@ -21,9 +21,9 @@ #include #include -#ifdef CONFIG_HW_PERF_EVENTS extern void sh_backtrace(struct pt_regs * const regs, unsigned int depth); +#ifdef CONFIG_HW_PERF_EVENTS /* * This will need to be reworked when multiple PMUs are supported. */ @@ -57,7 +57,7 @@ void __exit oprofile_arch_exit(void) #else int __init oprofile_arch_init(struct oprofile_operations *ops) { - pr_info("oprofile: hardware counters not available\n"); + ops->backtrace = sh_backtrace; return -ENODEV; } void __exit oprofile_arch_exit(void) {}