Merge tag 'v3.10.56' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 05b402ee5884043249cde2e710c6000641e7c73e..cd17762037819d63dee7c1424abf56a989834aa9 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -1405,6 +1405,11 @@ retry:
         */
        if (ctx->is_active) {
                raw_spin_unlock_irq(&ctx->lock);
+               /*
+                * Reload the task pointer, it might have been changed by
+                * a concurrent perf_event_context_sched_out().
+                */
+               task = ctx->task;
                goto retry;
        }
 
@@ -1836,6 +1841,11 @@ retry:
         */
        if (ctx->is_active) {
                raw_spin_unlock_irq(&ctx->lock);
+               /*
+                * Reload the task pointer, it might have been changed by
+                * a concurrent perf_event_context_sched_out().
+                */
+               task = ctx->task;
                goto retry;
        }