From 8100f6d37796da435a077a0d1aad7881e3b82a91 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Jun 2009 10:21:52 -0700
Subject: [PATCH] --- yaml --- r: 145496 b: refs/heads/master c:
 27704a16c9e0fb4c6b04344c7c4c40ac16148ec0 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/gpu/drm/drm_bufs.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5d7f8be101de..1bfdd6a13ed3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9e10124e269a39de089c5e0d9936fae2ff889b2
+refs/heads/master: 27704a16c9e0fb4c6b04344c7c4c40ac16148ec0
diff --git a/trunk/drivers/gpu/drm/drm_bufs.c b/trunk/drivers/gpu/drm/drm_bufs.c
index 80a257554b30..0411d912d82a 100644
--- a/trunk/drivers/gpu/drm/drm_bufs.c
+++ b/trunk/drivers/gpu/drm/drm_bufs.c
@@ -371,8 +371,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
 	list->user_token = list->hash.key << PAGE_SHIFT;
 	mutex_unlock(&dev->struct_mutex);
 
-	if (!(map->flags & _DRM_DRIVER))
-		list->master = dev->primary->master;
+	list->master = dev->primary->master;
 	*maplist = list;
 	return 0;
 	}