Merge tag 'powerpc-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[firefly-linux-kernel-4.4.55.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 7f2fbb8b5069b3258bdd9721c60b850f965953d1..8812d8e35f5b03b13e148ff67ae33453cad306c1 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -8508,6 +8508,18 @@ void __init perf_event_init(void)
                     != 1024);
 }
 
+ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
+                             char *page)
+{
+       struct perf_pmu_events_attr *pmu_attr =
+               container_of(attr, struct perf_pmu_events_attr, attr);
+
+       if (pmu_attr->event_str)
+               return sprintf(page, "%s\n", pmu_attr->event_str);
+
+       return 0;
+}
+
 static int __init perf_event_sysfs_init(void)
 {
        struct pmu *pmu;