2 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 219748d00262..ca226a91abee 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -124,6 +124,8 @@ extern struct cred init_cred;
 # define INIT_PERF_COUNTERS(tsk)                                        \
         .perf_counter_ctx.counter_list =                                \
                 LIST_HEAD_INIT(tsk.perf_counter_ctx.counter_list),      \
+        .perf_counter_ctx.event_list =                                  \
+                LIST_HEAD_INIT(tsk.perf_counter_ctx.event_list),        \
         .perf_counter_ctx.lock =                                        \
                 __SPIN_LOCK_UNLOCKED(tsk.perf_counter_ctx.lock),
 #else
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index b39456ad74a1..4c4e9eb37ab0 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -1506,7 +1506,7 @@ static void perf_swcounter_ctx_event(struct perf_counter_context *ctx,
 {
         struct perf_counter *counter;
 
-        if (list_empty(&ctx->event_list))
+        if (system_state != SYSTEM_RUNNING || list_empty(&ctx->event_list))
                 return;
 
         rcu_read_lock();