Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03d8e80b authored by Mischa Jonker's avatar Mischa Jonker Committed by Ingo Molnar
Browse files

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: default avatarMischa Jonker <mjonker@synopsys.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1370339148-5566-1-git-send-email-mjonker@synopsys.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e712209a

arch/metag/kernel/perf/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ static int __init init_hw_perf_events(void) 
	}



	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:

	return ret;

}

include/linux/perf_event.h

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ struct pmu { 


	struct device			*dev;

	const struct attribute_group	**attr_groups;

	char				*name;

	const char			*name;

	int				type;



	int * __percpu			pmu_disable_count;
@@ -519,7 +519,7 @@ struct perf_output_handle { 


#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 int perf_num_counters(void);

kernel/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -6179,7 +6179,7 @@ static int pmu_dev_alloc(struct pmu *pmu) 
static struct lock_class_key cpuctx_mutex;

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;