diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2014-07-17 11:45:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-07-17 11:45:29 +0200 |
| commit | b5e4111f027c4be85dbe97e090530d03c55c4cf4 (patch) | |
| tree | 11e0a37cb59314f4e9a7b2810124a4a7a33140e5 /include/uapi/linux/perf_event.h | |
| parent | locking/mutexes: Optimize mutex trylock slowpath (diff) | |
| parent | Merge branch 'liblockdep-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux into locking/urgent (diff) | |
Merge branch 'locking/urgent' into locking/core, before applying larger changes and to refresh the branch with fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/perf_event.h')
| -rw-r--r-- | include/uapi/linux/perf_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 5312fae47218..9269de254874 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -705,6 +705,7 @@ enum perf_event_type { * u32 min; * u64 ino; * u64 ino_generation; + * u32 prot, flags; * char filename[]; * struct sample_id sample_id; * }; |