diff --git a/[refs] b/[refs] index 1228c018e642..a337255e7693 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffb5e0fb44d0829021a51f972df90166bc9b700e +refs/heads/master: 01bb2dc4e47639c8e7eddb1718720a051bcdc955 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); /*