diff --git a/[refs] b/[refs]
index 58e2e9befa96..27c199191edb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60f2ee0b4a6b852299d8e30aeb2af517ef5ee19c
+refs/heads/master: 4e74f36d08e83390121d088f1f62e3337603df89
diff --git a/trunk/drivers/gpu/drm/drm_bufs.c b/trunk/drivers/gpu/drm/drm_bufs.c
index 7fb690bcd492..72c667f9bee1 100644
--- a/trunk/drivers/gpu/drm/drm_bufs.c
+++ b/trunk/drivers/gpu/drm/drm_bufs.c
@@ -440,6 +440,7 @@ int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t *map)
 
 	return 0;
 }
+EXPORT_SYMBOL(drm_rmmap_locked);
 
 int drm_rmmap(struct drm_device *dev, drm_local_map_t *map)
 {
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_cp.c b/trunk/drivers/gpu/drm/radeon/radeon_cp.c
index 4f5d1e996217..63212d7bbc28 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_cp.c
@@ -1804,7 +1804,7 @@ void radeon_master_destroy(struct drm_device *dev, struct drm_master *master)
 
 	master_priv->sarea_priv = NULL;
 	if (master_priv->sarea)
-		drm_rmmap(dev, master_priv->sarea);
+		drm_rmmap_locked(dev, master_priv->sarea);
 
 	drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER);