Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 20 insertions, 15 deletions

diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index bea2a7d5b2b2..12dcdd1832f0 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -53,6 +53,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
         DECLARE_WAITQUEUE(entry, current);
         struct drm_lock *lock = data;
         int ret = 0;
+        unsigned long irqflags;
 
         ++file_priv->lock_count;
 
@@ -71,9 +72,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                         return -EINVAL;
 
         add_wait_queue(&dev->lock.lock_queue, &entry);
-        spin_lock(&dev->lock.spinlock);
+        spin_lock_irqsave(&dev->lock.spinlock, irqflags);
         dev->lock.user_waiters++;
-        spin_unlock(&dev->lock.spinlock);
+        spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);
         for (;;) {
                 __set_current_state(TASK_INTERRUPTIBLE);
                 if (!dev->lock.hw_lock) {
@@ -95,9 +96,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                         break;
                 }
         }
-        spin_lock(&dev->lock.spinlock);
+        spin_lock_irqsave(&dev->lock.spinlock, irqflags);
         dev->lock.user_waiters--;
-        spin_unlock(&dev->lock.spinlock);
+        spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);
         __set_current_state(TASK_RUNNING);
         remove_wait_queue(&dev->lock.lock_queue, &entry);
 
@@ -198,8 +199,9 @@ int drm_lock_take(struct drm_lock_data *lock_data,
 {
         unsigned int old, new, prev;
         volatile unsigned int *lock = &lock_data->hw_lock->lock;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         do {
                 old = *lock;
                 if (old & _DRM_LOCK_HELD)
@@ -211,7 +213,7 @@ int drm_lock_take(struct drm_lock_data *lock_data,
                 }
                 prev = cmpxchg(lock, old, new);
         } while (prev != old);
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 
         if (_DRM_LOCKING_CONTEXT(old) == context) {
                 if (old & _DRM_LOCK_HELD) {
@@ -272,15 +274,16 @@ int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context)
 {
         unsigned int old, new, prev;
         volatile unsigned int *lock = &lock_data->hw_lock->lock;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         if (lock_data->kernel_waiters != 0) {
                 drm_lock_transfer(lock_data, 0);
                 lock_data->idle_has_lock = 1;
-                spin_unlock(&lock_data->spinlock);
+                spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
                 return 1;
         }
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 
         do {
                 old = *lock;
@@ -344,19 +347,20 @@ static int drm_notifier(void *priv)
 void drm_idlelock_take(struct drm_lock_data *lock_data)
 {
         int ret = 0;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         lock_data->kernel_waiters++;
         if (!lock_data->idle_has_lock) {
 
-                spin_unlock(&lock_data->spinlock);
+                spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
                 ret = drm_lock_take(lock_data, DRM_KERNEL_CONTEXT);
-                spin_lock(&lock_data->spinlock);
+                spin_lock_irqsave(&lock_data->spinlock, irqflags);
 
                 if (ret == 1)
                         lock_data->idle_has_lock = 1;
         }
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 }
 EXPORT_SYMBOL(drm_idlelock_take);
 
@@ -364,8 +368,9 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)
 {
         unsigned int old, prev;
         volatile unsigned int *lock = &lock_data->hw_lock->lock;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         if (--lock_data->kernel_waiters == 0) {
                 if (lock_data->idle_has_lock) {
                         do {
@@ -376,7 +381,7 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)
                         lock_data->idle_has_lock = 0;
                 }
         }
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 }
 EXPORT_SYMBOL(drm_idlelock_release);