diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-08 11:28:27 -0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-19 04:16:10 -0400 |
| commit | 83e41eb9cc3de6c08d63bbcf2c953bfbf65c025c (patch) | |
| tree | 562ef084d4a477bf35cf6af8fd308856f3270124 /drivers/gpu/drm | |
| parent | fb9a90f7c674f3ddef6baf55cb1612dadd8ea752 (diff) | |
Revert "drm/i915: Prevent module unload to avoid random memory corruption"
This reverts commit 6939a5aca7cfada279a24c307e772f33104fca20.
Daniel Vetter supplied a set of fixes for all the module unload bugs he
could trigger on his machines, so let the fun recommence!
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index a99fae33bdf6..f451af69d437 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
| @@ -2065,9 +2065,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
| 2065 | dev_priv->mchdev_lock = &mchdev_lock; | 2065 | dev_priv->mchdev_lock = &mchdev_lock; |
| 2066 | spin_unlock(&mchdev_lock); | 2066 | spin_unlock(&mchdev_lock); |
| 2067 | 2067 | ||
| 2068 | /* XXX Prevent module unload due to memory corruption bugs. */ | ||
| 2069 | __module_get(THIS_MODULE); | ||
| 2070 | |||
| 2071 | return 0; | 2068 | return 0; |
| 2072 | 2069 | ||
| 2073 | out_workqueue_free: | 2070 | out_workqueue_free: |