Merge tag 'drm-intel-fixes-2014-06-17' of git://anongit.freedesktop.org/drm-intel...

[people/arne_f/kernel.git] / drivers / gpu / drm / i915 / i915_irq.c

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 69aaa1100986ec6c4a8c76c4b3a6e040e2b0d1e4..267f069765adedffb942d1352649502ac624a364 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2402,7 +2402,7 @@ static void i915_error_work_func(struct work_struct *work)
                         * updates before
                         * the counter increment.
                         */
-                       smp_mb__before_atomic_inc();
+                       smp_mb__before_atomic();
                        atomic_inc(&dev_priv->gpu_error.reset_counter);
 
                        kobject_uevent_env(&dev->primary->kdev->kobj,