summaryrefslogtreecommitdiff
path: root/kernel/events
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2014-02-10 17:44:18 +0000
committerIngo Molnar <mingo@kernel.org>2014-02-27 12:43:21 +0100
commit9e3170411ed171a126f4dca1672012a33efe59e5 (patch)
treef36e9f12000658ac1a380f49efb92583c3f2e057 /kernel/events
parentff5a7088f0f04dd246e514f898cab0c863c3598d (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>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c2
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)
* 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;