diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-21 14:24:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-21 14:24:48 -0700 |
| commit | 18f5600ba2629feca202a7d6387b9c32371af329 (patch) | |
| tree | cd65b0d53bd0ad65bd02eddda51373a775d8f26d /include/linux | |
| parent | Merge tag 'for-linus-v3.6-rc7' of git://oss.sgi.com/xfs/xfs (diff) | |
| parent | tracing: Don't call page_to_pfn() if page is NULL (diff) | |
| download | linux-dev-18f5600ba2629feca202a7d6387b9c32371af329.tar.xz linux-dev-18f5600ba2629feca202a7d6387b9c32371af329.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Small perf fixlets"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tracing: Don't call page_to_pfn() if page is NULL
perf/x86: Fix Intel Ivy Bridge support
perf/x86/ibs: Check syscall attribute flags
perf/x86: Export Sandy Bridge uncore clockticks event in sysfs
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/perf_event.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 33ed9d605f91..bdb41612bfec 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -274,6 +274,8 @@ struct perf_event_attr { __u64 branch_sample_type; /* enum branch_sample_type */ }; +#define perf_flags(attr) (*(&(attr)->read_format + 1)) + /* * Ioctls that can be done on a perf event fd: */ |