Merge tag 'for-5.1/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/devic...

[platform/kernel/linux-starfive.git] / drivers / perf / arm-ccn.c

diff --git a/drivers/perf/arm-ccn.c b/drivers/perf/arm-ccn.c
index 7dd850e..2ae7602 100644 (file)
--- a/drivers/perf/arm-ccn.c
+++ b/drivers/perf/arm-ccn.c
@@ -741,10 +741,7 @@ static int arm_ccn_pmu_event_init(struct perf_event *event)
                return -EOPNOTSUPP;
        }
 
-       if (has_branch_stack(event) || event->attr.exclude_user ||
-                       event->attr.exclude_kernel || event->attr.exclude_hv ||
-                       event->attr.exclude_idle || event->attr.exclude_host ||
-                       event->attr.exclude_guest) {
+       if (has_branch_stack(event)) {
                dev_dbg(ccn->dev, "Can't exclude execution levels!\n");
                return -EINVAL;
        }
@@ -1290,6 +1287,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn)
                .read = arm_ccn_pmu_event_read,
                .pmu_enable = arm_ccn_pmu_enable,
                .pmu_disable = arm_ccn_pmu_disable,
+               .capabilities = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        /* No overflow interrupt? Have to use a timer instead. */