2 files changed, 5 insertions, 1 deletions

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 2e069d1288df..8f4a70f2eca8 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -319,7 +319,10 @@ struct perf_event {
          */
         struct list_head                migrate_entry;
 
-        struct hlist_node               hlist_entry;
+        union {
+                struct hlist_node       hlist_entry;
+                struct list_head        active_entry;
+        };
         int                             nr_siblings;
         int                             group_flags;
         struct perf_event               *group_leader;
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 72348dc192c1..403b781daafb 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6655,6 +6655,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
         INIT_LIST_HEAD(&event->event_entry);
         INIT_LIST_HEAD(&event->sibling_list);
         INIT_LIST_HEAD(&event->rb_entry);
+        INIT_LIST_HEAD(&event->active_entry);
 
         init_waitqueue_head(&event->waitq);
         init_irq_work(&event->pending, perf_pending_event);