lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oprofile: Make op_name_from_perf_id() global

Browse Source 
Make op_name_from_perf_id() global so that we have a way for each
architecture to construct an oprofile name for op->cpu_type. We need to
remove the argument from the function prototype so that we can hide all
implementation details inside the function.

Signed-off-by: Matt Fleming <matt@console-pimps.org>
Signed-off-by: Robert Richter <robert.richter@amd.com>
This commit is contained in:
Matt Fleming
2010-10-08 21:42:17 +01:00
committed by Robert Richter
parent 84c7991059
commit 56946331b2
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/oprofile/common.c
View File

@@ -155,8 +155,10 @@ static void op_perf_stop(void)
} }
static char *op_name_from_perf_id(enum arm_perf_pmu_ids id) char *op_name_from_perf_id(void)
{ {
enum arm_perf_pmu_ids id = armpmu_get_pmu_id();
switch (id) { switch (id) {
case ARM_PERF_PMU_ID_XSCALE1: case ARM_PERF_PMU_ID_XSCALE1:
return "arm/xscale1"; return "arm/xscale1";
@@ -391,7 +393,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
ops->start = op_arm_start; ops->start = op_arm_start;
ops->stop = op_arm_stop; ops->stop = op_arm_stop;
ops->shutdown = op_arm_stop; ops->shutdown = op_arm_stop;
ops->cpu_type = op_name_from_perf_id(armpmu_get_pmu_id()); ops->cpu_type = op_name_from_perf_id();
if (!ops->cpu_type) if (!ops->cpu_type)
ret = -ENODEV; ret = -ENODEV;

4
include/linux/oprofile.h
View File

@@ -185,4 +185,8 @@ int oprofile_add_data(struct op_entry *entry, unsigned long val);
int oprofile_add_data64(struct op_entry *entry, u64 val); int oprofile_add_data64(struct op_entry *entry, u64 val);
int oprofile_write_commit(struct op_entry *entry); int oprofile_write_commit(struct op_entry *entry);
#ifdef CONFIG_PERF_EVENTS
char *op_name_from_perf_id(void);
#endif /* CONFIG_PERF_EVENTS */
#endif /* OPROFILE_H */ #endif /* OPROFILE_H */