diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-14 08:10:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-14 08:10:08 -0400 |
| commit | cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6 (patch) | |
| tree | 9eed06e09fbbe3764f47e4da7f8d15b5965f6cb3 /include/uapi/linux | |
| parent | 4cdf77a828b056258f48a9f6078bd2f77d9704bb (diff) | |
| parent | 4ba96195051be30160af6d5f5f83f9a055ab1f23 (diff) | |
Merge branch 'perf/core' into perf/urgent, to pick up the latest fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux')
| -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 { | |||
| 705 | * u32 min; | 705 | * u32 min; |
| 706 | * u64 ino; | 706 | * u64 ino; |
| 707 | * u64 ino_generation; | 707 | * u64 ino_generation; |
| 708 | * u32 prot, flags; | ||
| 708 | * char filename[]; | 709 | * char filename[]; |
| 709 | * struct sample_id sample_id; | 710 | * struct sample_id sample_id; |
| 710 | * }; | 711 | * }; |