diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-12 09:43:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-12 09:43:53 -0800 |
| commit | 69581c74721f40b2e21667197a135120844c03b7 (patch) | |
| tree | 8fc2b3e655d93546d42fcc6c899266b92d6d3aa5 /tools/include/uapi/drm | |
| parent | b39545684a90ef3374abc0969d64c7bc540d128d (diff) | |
| parent | 505ee76761062a1872b024140e886b7136a6c1d5 (diff) | |
| download | op-kernel-dev-69581c74721f40b2e21667197a135120844c03b7.zip op-kernel-dev-69581c74721f40b2e21667197a135120844c03b7.tar.gz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf tool fixes from Thomas Gleixner:
"A small set of fixes for perf tool:
- synchronize the i915 drm header to avoid the 'out of date' warning
- make sure that perf trace cleans up its temporary files on exit
- unbreak the build with newer flex versions
- add missing braces in the eBPF parsing rules"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tooling/headers: Sync the tools/include/uapi/drm/i915_drm.h UAPI header
perf trace: Call machine__exit() at exit
perf tools: Fix eBPF event specification parsing
perf tools: Add "reject" option for parse-events.l
Diffstat (limited to 'tools/include/uapi/drm')
| -rw-r--r-- | tools/include/uapi/drm/i915_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/include/uapi/drm/i915_drm.h b/tools/include/uapi/drm/i915_drm.h index 6598fb7..9816590 100644 --- a/tools/include/uapi/drm/i915_drm.h +++ b/tools/include/uapi/drm/i915_drm.h @@ -829,6 +829,7 @@ struct drm_i915_gem_exec_fence { #define I915_EXEC_FENCE_WAIT (1<<0) #define I915_EXEC_FENCE_SIGNAL (1<<1) +#define __I915_EXEC_FENCE_UNKNOWN_FLAGS (-(I915_EXEC_FENCE_SIGNAL << 1)) __u32 flags; }; |
