Merge remote-tracking branch 'tip/auto-latest'

[deliverable/linux.git] / include / linux / perf / arm_pmu.h

diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h
index dc1f2f30c961e3b0174527d75867df67c8f5878a..05d46ddb6f568ad2b3d8a8097f0d02f42d7f40b3 100644 (file)
--- a/include/linux/perf/arm_pmu.h
+++ b/include/linux/perf/arm_pmu.h
@@ -116,7 +116,7 @@ struct arm_pmu {
        DECLARE_BITMAP(pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS);
        struct platform_device  *plat_device;
        struct pmu_hw_events    __percpu *hw_events;
-       struct list_head        entry;
+       struct hlist_node       node;
        struct notifier_block   cpu_pm_nb;
        /* the attr_groups array must be NULL-terminated */
        const struct attribute_group *attr_groups[ARMPMU_NR_ATTR_GROUPS + 1];