artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
564211f
)
lock->ctx != NULL => lock->ctx
author
jsg
<jsg@openbsd.org>
Tue, 9 Jan 2018 14:23:03 +0000
(14:23 +0000)
committer
jsg
<jsg@openbsd.org>
Tue, 9 Jan 2018 14:23:03 +0000
(14:23 +0000)
requested by kettenis@
sys/dev/pci/drm/linux_ww_mutex.h
patch
|
blob
|
history
diff --git
a/sys/dev/pci/drm/linux_ww_mutex.h
b/sys/dev/pci/drm/linux_ww_mutex.h
index
fb1b267
..
4476af7
100644
(file)
--- a/
sys/dev/pci/drm/linux_ww_mutex.h
+++ b/
sys/dev/pci/drm/linux_ww_mutex.h
@@
-164,7
+164,7
@@
__ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx, bool slow, bo
* resources.
*/
if (slow || ctx == NULL ||
- (lock->ctx
!= NULL
&& ctx->stamp < lock->ctx->stamp)) {
+ (lock->ctx && ctx->stamp < lock->ctx->stamp)) {
int s = msleep(lock, &lock->lock,
intr ? PCATCH : 0,
ctx ? ctx->ww_class->name : "ww_mutex_lock", 0);