From db65efd2462995f9d24dfd37155bbfc22ad8b4f6 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Fri, 21 Jan 2011 18:45:47 +0100 Subject: [PATCH] --- yaml --- r: 232297 b: refs/heads/master c: 806839b22cbda90176d7f8d421889bddd7826e93 h: refs/heads/master i: 232295: 8f7a903fbdb9326217219c9c69347055bab9e2b9 v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bdc86d400539..17ca4951a999 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 547e9fd7d328af261f184bf66effc5033c886498 +refs/heads/master: 806839b22cbda90176d7f8d421889bddd7826e93 diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index c5fa717cf099..126a302c481c 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -6136,7 +6136,7 @@ static void perf_event_exit_task_context(struct task_struct *child, int ctxn) * scheduled, so we are now safe from rescheduling changing * our context. */ - child_ctx = rcu_dereference(child->perf_event_ctxp[ctxn]); + child_ctx = rcu_dereference_raw(child->perf_event_ctxp[ctxn]); task_ctx_sched_out(child_ctx, EVENT_ALL); /*