summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-18 13:45:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-18 13:45:48 -0700
commitbd3fd451ff3b205f0bde4d1bf7a310552c40d6e0 (patch)
treeaceca2fab7b29490405bfda1597e43573ffe99f6 /drivers
parentf28535c100e3c3066ed3506d90948cf023dad21a (diff)
parent112dc0c8069e5554e0ad29c58228f1e6ca49e13d (diff)
downloadlwn-bd3fd451ff3b205f0bde4d1bf7a310552c40d6e0.tar.gz
lwn-bd3fd451ff3b205f0bde4d1bf7a310552c40d6e0.zip
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar: "Two lockless_dereference() related fixes" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: locking/barriers: Suppress sparse warnings in lockless_dereference() Revert "drm/fb-helper: Reduce READ_ONCE(master) to lockless_dereference"
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/drm_fb_helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index ce54e985d91b..0a06f9120b5a 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -464,7 +464,7 @@ static bool drm_fb_helper_is_bound(struct drm_fb_helper *fb_helper)
/* Sometimes user space wants everything disabled, so don't steal the
* display if there's a master. */
- if (lockless_dereference(dev->master))
+ if (READ_ONCE(dev->master))
return false;
drm_for_each_crtc(crtc, dev) {