aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-03-23 04:16:03 -0400
committerIngo Molnar <mingo@kernel.org>2012-03-23 04:16:03 -0400
commitc5bc437702b24817cabd65a6a57971ff91a7712c (patch)
treeecf85a6f3f788d5009cf1136f3a30907e02e8802 /include
parent6605f9ac69593d480324ba5fa05f64cfebf4db2f (diff)
parent4bf9ce1b5ecffffeb8b9d7e925bac3e6b10109aa (diff)
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Cleanups and fixes for perf/core: . Short term fix for 'diff' tool breakage related to perf.data files with multiple events. From Jiri Olsa . Cleanup for event id tracepoint reading routine, from Borislav Petkov . 32-bit compilation fixes from Jiri Olsa . Event parsing modifier assignment fixes from Jiri Olsa Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/perf_event.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index bd9f55a5958d..57ae485e80fc 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -550,6 +550,7 @@ struct perf_guest_info_callbacks {
550#include <linux/irq_work.h> 550#include <linux/irq_work.h>
551#include <linux/static_key.h> 551#include <linux/static_key.h>
552#include <linux/atomic.h> 552#include <linux/atomic.h>
553#include <linux/sysfs.h>
553#include <asm/local.h> 554#include <asm/local.h>
554 555
555#define PERF_MAX_STACK_DEPTH 255 556#define PERF_MAX_STACK_DEPTH 255
@@ -1291,5 +1292,18 @@ do { \
1291 register_cpu_notifier(&fn##_nb); \ 1292 register_cpu_notifier(&fn##_nb); \
1292} while (0) 1293} while (0)
1293 1294
1295
1296#define PMU_FORMAT_ATTR(_name, _format) \
1297static ssize_t \
1298_name##_show(struct device *dev, \
1299 struct device_attribute *attr, \
1300 char *page) \
1301{ \
1302 BUILD_BUG_ON(sizeof(_format) >= PAGE_SIZE); \
1303 return sprintf(page, _format "\n"); \
1304} \
1305 \
1306static struct device_attribute format_attr_##_name = __ATTR_RO(_name)
1307
1294#endif /* __KERNEL__ */ 1308#endif /* __KERNEL__ */
1295#endif /* _LINUX_PERF_EVENT_H */ 1309#endif /* _LINUX_PERF_EVENT_H */