diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-24 07:30:51 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-27 01:51:45 +0100 |
| commit | 2a88b6e81589b1d064e03db066feaaa58f6a2d13 (patch) | |
| tree | 2d306da7f6dccabdb1d7615e9fb897bc997aeefc /arch | |
| parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
| download | linux-2a88b6e81589b1d064e03db066feaaa58f6a2d13.tar.xz linux-2a88b6e81589b1d064e03db066feaaa58f6a2d13.zip | |
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')
| -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) return -ENODEV; ops = &sh7750_perf_counter_ops; - ops->cpu_type = (char *)get_cpu_subtype(¤t_cpu_data); + ops->cpu_type = "sh/sh7750"; - printk(KERN_INFO "oprofile: using SH-4 (%s) performance monitoring.\n", - sh7750_perf_counter_ops.cpu_type); + printk(KERN_INFO "oprofile: using SH-4 performance monitoring.\n"); /* Clear the counters */ ctrl_outw(ctrl_inw(PMCR1) | PMCR_PMCLR, PMCR1); @@ -270,4 +269,3 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) void oprofile_arch_exit(void) { } - |