From 9221678c31db65b3d5a715c49b8f230dd0784b89 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 19 Jan 2011 12:51:39 +0100 Subject: [PATCH] --- yaml --- r: 232296 b: refs/heads/master c: 547e9fd7d328af261f184bf66effc5033c886498 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a25db9a385e5..bdc86d400539 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c8a9b25b5de3f1eeac721cf34f4379e56d5d694 +refs/heads/master: 547e9fd7d328af261f184bf66effc5033c886498 diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index 244ca3acb0ee..c5fa717cf099 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -5380,6 +5380,8 @@ static int pmu_dev_alloc(struct pmu *pmu) goto out; } +static struct lock_class_key cpuctx_mutex; + int perf_pmu_register(struct pmu *pmu, char *name, int type) { int cpu, ret; @@ -5428,6 +5430,7 @@ int perf_pmu_register(struct pmu *pmu, char *name, int type) cpuctx = per_cpu_ptr(pmu->pmu_cpu_context, cpu); __perf_event_init_context(&cpuctx->ctx); + lockdep_set_class(&cpuctx->ctx.mutex, &cpuctx_mutex); cpuctx->ctx.type = cpu_context; cpuctx->ctx.pmu = pmu; cpuctx->jiffies_interval = 1;