diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
| commit | 03fe805a098422d27cbbbad29a54ff1349da3622 (patch) | |
| tree | 0db9cc9a701203ddcee58e5b907d4fb8ad31b421 /include/uapi/linux/perf_event.h | |
| parent | 50dd9050e45ce11c575eabcaee8a914caf78fb74 (diff) | |
| parent | 5646eda5851e6cfdfa22d41895e3f5daffa643d3 (diff) | |
Merge branch 'topic/monotonic' into for-next
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 { | |||
| 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 | * }; |