Merge tag 'tomoyo-pr-20210628' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1

[linux-2.6-microblaze.git] / drivers / perf / qcom_l2_pmu.c

diff --git a/drivers/perf/qcom_l2_pmu.c b/drivers/perf/qcom_l2_pmu.c
index fc54a80..5b093ba 100644 (file)
--- a/drivers/perf/qcom_l2_pmu.c
+++ b/drivers/perf/qcom_l2_pmu.c
@@ -679,11 +679,8 @@ static ssize_t l2cache_pmu_event_show(struct device *dev,
        return sysfs_emit(page, "event=0x%02llx\n", pmu_attr->id);
 }
 
-#define L2CACHE_EVENT_ATTR(_name, _id)                                      \
-       (&((struct perf_pmu_events_attr[]) {                                 \
-               { .attr = __ATTR(_name, 0444, l2cache_pmu_event_show, NULL), \
-                 .id = _id, }                                               \
-       })[0].attr.attr)
+#define L2CACHE_EVENT_ATTR(_name, _id)                     \
+       PMU_EVENT_ATTR_ID(_name, l2cache_pmu_event_show, _id)
 
 static struct attribute *l2_cache_pmu_events[] = {
        L2CACHE_EVENT_ATTR(cycles, L2_EVENT_CYCLES),
@@ -869,14 +866,14 @@ static int l2_cache_pmu_probe_cluster(struct device *dev, void *data)
        irq = platform_get_irq(sdev, 0);
        if (irq < 0)
                return irq;
-       irq_set_status_flags(irq, IRQ_NOAUTOEN);
        cluster->irq = irq;
 
        cluster->l2cache_pmu = l2cache_pmu;
        cluster->on_cpu = -1;
 
        err = devm_request_irq(&pdev->dev, irq, l2_cache_handle_irq,
-                              IRQF_NOBALANCING | IRQF_NO_THREAD,
+                              IRQF_NOBALANCING | IRQF_NO_THREAD |
+                              IRQF_NO_AUTOEN,
                               "l2-cache-pmu", cluster);
        if (err) {
                dev_err(&pdev->dev,