diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-10-24 01:30:51 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-26 20:51:45 -0400 |
commit | 2a88b6e81589b1d064e03db066feaaa58f6a2d13 (patch) | |
tree | 2d306da7f6dccabdb1d7615e9fb897bc997aeefc /arch/sh | |
parent | f8d56f1771e4867acc461146764b4feeb5245669 (diff) |
sh: oprofile: Fix up the SH7750 performance counter name.
Rather than varying this on a subtype level, we use the counter type as a
generic identifier. This simplifies logic in the userspace tools where no
fundamental difference exists across the various subtypes.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/oprofile/op_model_sh7750.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/sh/oprofile/op_model_sh7750.c b/arch/sh/oprofile/op_model_sh7750.c index 6b9a98e07004..008b3b03750a 100644 --- a/arch/sh/oprofile/op_model_sh7750.c +++ b/arch/sh/oprofile/op_model_sh7750.c | |||
@@ -255,10 +255,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
255 | return -ENODEV; | 255 | return -ENODEV; |
256 | 256 | ||
257 | ops = &sh7750_perf_counter_ops; | 257 | ops = &sh7750_perf_counter_ops; |
258 | ops->cpu_type = (char *)get_cpu_subtype(¤t_cpu_data); | 258 | ops->cpu_type = "sh/sh7750"; |
259 | 259 | ||
260 | printk(KERN_INFO "oprofile: using SH-4 (%s) performance monitoring.\n", | 260 | printk(KERN_INFO "oprofile: using SH-4 performance monitoring.\n"); |
261 | sh7750_perf_counter_ops.cpu_type); | ||
262 | 261 | ||
263 | /* Clear the counters */ | 262 | /* Clear the counters */ |
264 | ctrl_outw(ctrl_inw(PMCR1) | PMCR_PMCLR, PMCR1); | 263 | ctrl_outw(ctrl_inw(PMCR1) | PMCR_PMCLR, PMCR1); |
@@ -270,4 +269,3 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
270 | void oprofile_arch_exit(void) | 269 | void oprofile_arch_exit(void) |
271 | { | 270 | { |
272 | } | 271 | } |
273 | |||