From fea37a43e8cc06ea9a3189ca4944a3b79d081eb9 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 8 Oct 2010 16:28:27 +0100 Subject: [PATCH] --- yaml --- r: 218307 b: refs/heads/master c: 83e41eb9cc3de6c08d63bbcf2c953bfbf65c025c h: refs/heads/master i: 218305: e2c33ec64b11a9010b1c1c6f84976dc20ba31889 218303: 1a8a2be753151c1ada3fc8e20aa3bf425df592ba v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 920410f0053e..9740b5d175af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb9a90f7c674f3ddef6baf55cb1612dadd8ea752 +refs/heads/master: 83e41eb9cc3de6c08d63bbcf2c953bfbf65c025c diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c index a99fae33bdf6..f451af69d437 100644 --- a/trunk/drivers/gpu/drm/i915/i915_dma.c +++ b/trunk/drivers/gpu/drm/i915/i915_dma.c @@ -2065,9 +2065,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) dev_priv->mchdev_lock = &mchdev_lock; spin_unlock(&mchdev_lock); - /* XXX Prevent module unload due to memory corruption bugs. */ - __module_get(THIS_MODULE); - return 0; out_workqueue_free: