diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-10-12 18:43:50 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-27 04:03:50 -0400 |
commit | 7c842470f3ec7457585c277b9c5f535e94796f59 (patch) | |
tree | f5b4929297ef4af1d03d927d2dc965e41e401945 /arch | |
parent | d1ba71f7645696020864fe3cea3049befbe50408 (diff) |
sh: oprofile: Make sure the backtrace op is available for timer-fallback.
Presently with hardware counter support disabled the backtrace op never
gets initialized. This is a regression over the previous behaviour, so
simply add it back in.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/oprofile/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/oprofile/common.c b/arch/sh/oprofile/common.c index 84533142da9b..b4c2d2b946dd 100644 --- a/arch/sh/oprofile/common.c +++ b/arch/sh/oprofile/common.c | |||
@@ -21,9 +21,9 @@ | |||
21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
22 | #include <asm/processor.h> | 22 | #include <asm/processor.h> |
23 | 23 | ||
24 | #ifdef CONFIG_HW_PERF_EVENTS | ||
25 | extern void sh_backtrace(struct pt_regs * const regs, unsigned int depth); | 24 | extern void sh_backtrace(struct pt_regs * const regs, unsigned int depth); |
26 | 25 | ||
26 | #ifdef CONFIG_HW_PERF_EVENTS | ||
27 | /* | 27 | /* |
28 | * This will need to be reworked when multiple PMUs are supported. | 28 | * This will need to be reworked when multiple PMUs are supported. |
29 | */ | 29 | */ |
@@ -57,7 +57,7 @@ void __exit oprofile_arch_exit(void) | |||
57 | #else | 57 | #else |
58 | int __init oprofile_arch_init(struct oprofile_operations *ops) | 58 | int __init oprofile_arch_init(struct oprofile_operations *ops) |
59 | { | 59 | { |
60 | pr_info("oprofile: hardware counters not available\n"); | 60 | ops->backtrace = sh_backtrace; |
61 | return -ENODEV; | 61 | return -ENODEV; |
62 | } | 62 | } |
63 | void __exit oprofile_arch_exit(void) {} | 63 | void __exit oprofile_arch_exit(void) {} |