perf: Add const qualifier to perf_pmu_register's 'name' arg
This allows us to use pdev->name for registering a PMU device. IMO the name is not supposed to be changed anyway. Signed-off-by: Mischa Jonker <mjonker@synopsys.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1370339148-5566-1-git-send-email-mjonker@synopsys.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
e712209a9e
commit
03d8e80beb
|
@ -882,7 +882,7 @@ static int __init init_hw_perf_events(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
register_cpu_notifier(&metag_pmu_notifier);
|
register_cpu_notifier(&metag_pmu_notifier);
|
||||||
ret = perf_pmu_register(&pmu, (char *)metag_pmu->name, PERF_TYPE_RAW);
|
ret = perf_pmu_register(&pmu, metag_pmu->name, PERF_TYPE_RAW);
|
||||||
out:
|
out:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -188,7 +188,7 @@ struct pmu {
|
||||||
|
|
||||||
struct device *dev;
|
struct device *dev;
|
||||||
const struct attribute_group **attr_groups;
|
const struct attribute_group **attr_groups;
|
||||||
char *name;
|
const char *name;
|
||||||
int type;
|
int type;
|
||||||
|
|
||||||
int * __percpu pmu_disable_count;
|
int * __percpu pmu_disable_count;
|
||||||
|
@ -519,7 +519,7 @@ struct perf_output_handle {
|
||||||
|
|
||||||
#ifdef CONFIG_PERF_EVENTS
|
#ifdef CONFIG_PERF_EVENTS
|
||||||
|
|
||||||
extern int perf_pmu_register(struct pmu *pmu, char *name, int type);
|
extern int perf_pmu_register(struct pmu *pmu, const char *name, int type);
|
||||||
extern void perf_pmu_unregister(struct pmu *pmu);
|
extern void perf_pmu_unregister(struct pmu *pmu);
|
||||||
|
|
||||||
extern int perf_num_counters(void);
|
extern int perf_num_counters(void);
|
||||||
|
|
|
@ -6179,7 +6179,7 @@ free_dev:
|
||||||
static struct lock_class_key cpuctx_mutex;
|
static struct lock_class_key cpuctx_mutex;
|
||||||
static struct lock_class_key cpuctx_lock;
|
static struct lock_class_key cpuctx_lock;
|
||||||
|
|
||||||
int perf_pmu_register(struct pmu *pmu, char *name, int type)
|
int perf_pmu_register(struct pmu *pmu, const char *name, int type)
|
||||||
{
|
{
|
||||||
int cpu, ret;
|
int cpu, ret;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue