diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-03-23 09:16:03 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-03-23 09:16:03 +0100 |
commit | c5bc437702b24817cabd65a6a57971ff91a7712c (patch) | |
tree | ecf85a6f3f788d5009cf1136f3a30907e02e8802 /arch/x86/kernel/cpu/perf_event.h | |
parent | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent (diff) | |
parent | perf diff: Fix to work with new hists design (diff) | |
download | linux-dev-c5bc437702b24817cabd65a6a57971ff91a7712c.tar.xz linux-dev-c5bc437702b24817cabd65a6a57971ff91a7712c.zip |
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 'arch/x86/kernel/cpu/perf_event.h')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h index 8484e77c211e..6638aaf54493 100644 --- a/arch/x86/kernel/cpu/perf_event.h +++ b/arch/x86/kernel/cpu/perf_event.h @@ -339,6 +339,7 @@ struct x86_pmu { * sysfs attrs */ int attr_rdpmc; + struct attribute **format_attrs; /* * CPU Hotplug hooks |