Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 0 insertions, 8 deletions

diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
index 2607753a320b..6d440fb894cf 100644
--- a/drivers/gpu/drm/drm_context.c
+++ b/drivers/gpu/drm/drm_context.c
@@ -333,14 +333,6 @@ int drm_addctx(struct drm_device *dev, void *data,
                 return -ENOMEM;
         }
 
-        if (ctx->handle != DRM_KERNEL_CONTEXT) {
-                if (dev->driver->context_ctor)
-                        if (!dev->driver->context_ctor(dev, ctx->handle)) {
-                                DRM_DEBUG("Running out of ctxs or memory.\n");
-                                return -ENOMEM;
-                        }
-        }
-
         ctx_entry = kmalloc(sizeof(*ctx_entry), GFP_KERNEL);
         if (!ctx_entry) {
                 DRM_DEBUG("out of memory\n");