diff options
author | Mark Rutland <mark.rutland@arm.com> | 2014-02-10 12:44:18 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-02-27 06:43:21 -0500 |
commit | 9e3170411ed171a126f4dca1672012a33efe59e5 (patch) | |
tree | f36e9f12000658ac1a380f49efb92583c3f2e057 | |
parent | ff5a7088f0f04dd246e514f898cab0c863c3598d (diff) |
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>
-rw-r--r-- | kernel/events/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index fa990061aa6c..425159882a6f 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) | |||
6313 | * Ensures all contexts with the same task_ctx_nr have the same | 6313 | * Ensures all contexts with the same task_ctx_nr have the same |
6314 | * pmu_cpu_context too. | 6314 | * pmu_cpu_context too. |
6315 | */ | 6315 | */ |
6316 | static void *find_pmu_context(int ctxn) | 6316 | static struct perf_cpu_context __percpu *find_pmu_context(int ctxn) |
6317 | { | 6317 | { |
6318 | struct pmu *pmu; | 6318 | struct pmu *pmu; |
6319 | 6319 | ||