Messages in this thread Patch in this message | | | Date | Thu, 27 Feb 2014 05:33:26 -0800 | From | tip-bot for Mark Rutland <> | Subject | [tip:perf/core] perf: Fix prototype of find_pmu_context() |
| |
Commit-ID: 9e3170411ed171a126f4dca1672012a33efe59e5 Gitweb: http://git.kernel.org/tip/9e3170411ed171a126f4dca1672012a33efe59e5 Author: Mark Rutland <mark.rutland@arm.com> AuthorDate: Mon, 10 Feb 2014 17:44:18 +0000 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Thu, 27 Feb 2014 12:43:21 +0100
perf: Fix prototype of find_pmu_context()
For some reason find_pmu_context() is defined as returning void * rather than a __percpu struct perf_cpu_context *. As all the requisite types are defined in advance there's no reason to keep it that way.
This patch modifies the prototype of pmu_find_context to return a __percpu struct perf_cpu_context *.
Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Reviewed-by: Dave Martin <Dave.Martin@arm.com> Acked-by: Will Deacon <will.deacon@arm.com> Link: http://lkml.kernel.org/r/1392054264-23570-2-git-send-email-mark.rutland@arm.com Signed-off-by: Ingo Molnar <mingo@kernel.org> --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c index fa99006..4251598 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6313,7 +6313,7 @@ static int perf_event_idx_default(struct perf_event *event) * Ensures all contexts with the same task_ctx_nr have the same * pmu_cpu_context too. */ -static void *find_pmu_context(int ctxn) +static struct perf_cpu_context __percpu *find_pmu_context(int ctxn) { struct pmu *pmu;
| |