summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-09 11:43:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-09 11:43:40 -0700
commitd6bcfd1a214ae9609b27417b1844c6b6f09ca125 (patch)
tree35555b713c6b013d87f2e0dd7a27723ba597c4a2 /drivers
parent8ea3f0afb23bc49a996f262ea04708b38de82bca (diff)
parent6939a5aca7cfada279a24c307e772f33104fca20 (diff)
downloadlinux-d6bcfd1a214ae9609b27417b1844c6b6f09ca125.tar.gz
linux-d6bcfd1a214ae9609b27417b1844c6b6f09ca125.tar.bz2
linux-d6bcfd1a214ae9609b27417b1844c6b6f09ca125.zip
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: drm/i915: Prevent module unload to avoid random memory corruption
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index c74e4e8006d4..2dd2c93ebfa3 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -2231,6 +2231,9 @@ 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: