diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-12 13:59:24 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-12 13:59:24 +0100 |
| commit | cda390bb8f0fc751194ef5f4c691ca8d3ff91009 (patch) | |
| tree | 9739758690c5107b73a09f632ae2f8fc2507db09 /include/uapi/linux | |
| parent | ARM: l2c: fix revision checking (diff) | |
| parent | ARM: kprobes: Fix test code compilation errors for ARMv4 targets (diff) | |
Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into fixes
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 { * u32 min; * u64 ino; * u64 ino_generation; + * u32 prot, flags; * char filename[]; * struct sample_id sample_id; * }; |