Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next

This is the 3rd respin of the drm-anon patches. They allow module unloading, use
the pin_fs_* helpers recommended by Al and are rebased on top of drm-next. Note
that there are minor conflicts with the "drm-minor" branch.

* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
  drm: init TTM dev_mapping in ttm_bo_device_init()
  drm: use anon-inode instead of relying on cdevs
  drm: add pseudo filesystem for shared inodes

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c
index ce6858765b37..f488be55d650 100644
--- a/drivers/gpu/drm/bochs/bochs_mm.c
+++ b/drivers/gpu/drm/bochs/bochs_mm.c
@@ -225,7 +225,9 @@ int bochs_mm_init(struct bochs_device *bochs)
 
         ret = ttm_bo_device_init(&bochs->ttm.bdev,
                                  bochs->ttm.bo_global_ref.ref.object,
-                                 &bochs_bo_driver, DRM_FILE_PAGE_OFFSET,
+                                 &bochs_bo_driver,
+                                 bochs->dev->anon_inode->i_mapping,
+                                 DRM_FILE_PAGE_OFFSET,
                                  true);
         if (ret) {
                 DRM_ERROR("Error initialising bo driver; %d\n", ret);
@@ -359,7 +361,7 @@ static int bochs_bo_create(struct drm_device *dev, int size, int align,
         }
 
         bochsbo->bo.bdev = &bochs->ttm.bdev;
-        bochsbo->bo.bdev->dev_mapping = dev->dev_mapping;
+        bochsbo->bo.bdev->dev_mapping = dev->anon_inode->i_mapping;
 
         bochs_ttm_placement(bochsbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);