projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_ringbuffer.h
diff --git
a/drivers/gpu/drm/i915/intel_ringbuffer.h
b/drivers/gpu/drm/i915/intel_ringbuffer.h
index
910c83c
..
e72017b
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/
drivers/gpu/drm/i915/intel_ringbuffer.h
@@
-55,7
+55,7
@@
struct intel_ring_hangcheck {
u32 seqno;
int score;
enum intel_ring_hangcheck_action action;
-
bool
deadlock;
+
int
deadlock;
};
struct intel_ringbuffer {