Merge branch 'master' into modesetting-gem

[platform/upstream/libdrm.git] / linux-core / drm_drv.c

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 36c0a14..aefbd76 100644 (file)
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -176,9 +176,11 @@ static struct drm_ioctl_desc drm_ioctls[] = {
 
        DRM_IOCTL_DEF(DRM_IOCTL_MM_INFO, drm_mm_info_ioctl, 0),
 
+#if OS_HAS_GEM
        DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, 0),
        DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH),
+#endif
 };
 
 #define DRM_CORE_IOCTL_COUNT   ARRAY_SIZE( drm_ioctls )
@@ -428,7 +430,7 @@ static void drm_cleanup(struct drm_device * dev)
 
        drm_ctxbitmap_cleanup(dev);
        drm_ht_remove(&dev->map_hash);
-       drm_memrange_takedown(&dev->offset_manager);
+       drm_mm_takedown(&dev->offset_manager);
        drm_ht_remove(&dev->object_hash);
 
        drm_put_minor(dev, &dev->primary);