summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLai Jiangshan <laijs@cn.fujitsu.com>2011-03-18 12:07:41 +0800
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2011-05-07 22:51:08 -0700
commitcb796ff338db9f064f4ecb7d41898e8bedcad4d9 (patch)
tree53ad56428dc26a4d59281e3862a347d083c3c5ec
parent1f8d36a1869f5efae4fadf6baf01f02211040b97 (diff)
downloadop-kernel-dev-cb796ff338db9f064f4ecb7d41898e8bedcad4d9.zip
op-kernel-dev-cb796ff338db9f064f4ecb7d41898e8bedcad4d9.tar.gz
perf,rcu: convert call_rcu(free_ctx) to kfree_rcu()
The rcu callback free_ctx() just calls a kfree(), so we use kfree_rcu() instead of the call_rcu(free_ctx). Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
-rw-r--r--kernel/perf_event.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 8e81a98..17a176f 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -586,14 +586,6 @@ static void get_ctx(struct perf_event_context *ctx)
WARN_ON(!atomic_inc_not_zero(&ctx->refcount));
}
-static void free_ctx(struct rcu_head *head)
-{
- struct perf_event_context *ctx;
-
- ctx = container_of(head, struct perf_event_context, rcu_head);
- kfree(ctx);
-}
-
static void put_ctx(struct perf_event_context *ctx)
{
if (atomic_dec_and_test(&ctx->refcount)) {
@@ -601,7 +593,7 @@ static void put_ctx(struct perf_event_context *ctx)
put_ctx(ctx->parent_ctx);
if (ctx->task)
put_task_struct(ctx->task);
- call_rcu(&ctx->rcu_head, free_ctx);
+ kfree_rcu(ctx, rcu_head);
}
}
OpenPOWER on IntegriCloud