diff options
author | Peter Zijlstra <peterz@infradead.org> | 2014-03-17 13:06:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 08:20:48 -0400 |
commit | 4e857c58efeb99393cba5a5d0d8ec7117183137c (patch) | |
tree | 3f6fd464e4fddb2fe90374c075c9d06603cf8bbc /drivers/gpu/drm/i915/i915_irq.c | |
parent | 1b15611e1c30b37abe393d411c316cd659920bf5 (diff) |
arch: Mass conversion of smp_mb__*()
Mostly scripted conversion of the smp_mb__* barriers.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-55dhyhocezdw1dg7u19hmh1u@git.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 7753249b3a95..5409bfafff63 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -2147,7 +2147,7 @@ static void i915_error_work_func(struct work_struct *work) | |||
2147 | * updates before | 2147 | * updates before |
2148 | * the counter increment. | 2148 | * the counter increment. |
2149 | */ | 2149 | */ |
2150 | smp_mb__before_atomic_inc(); | 2150 | smp_mb__before_atomic(); |
2151 | atomic_inc(&dev_priv->gpu_error.reset_counter); | 2151 | atomic_inc(&dev_priv->gpu_error.reset_counter); |
2152 | 2152 | ||
2153 | kobject_uevent_env(&dev->primary->kdev->kobj, | 2153 | kobject_uevent_env(&dev->primary->kdev->kobj, |