[MIPS] Lockdep: Fix recursion bug.

 trace_hardirqs_off -> atomic_inc -> local_irq_restore -> trace_hardirqs_off

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 20 insertions, 20 deletions

diff --git a/include/asm-mips/atomic.h b/include/asm-mips/atomic.h
index 8578869a8bcf..1ac50b6c47ad 100644
--- a/include/asm-mips/atomic.h
+++ b/include/asm-mips/atomic.h
@@ -79,9 +79,9 @@ static __inline__ void atomic_add(int i, atomic_t * v)
         } else {
                 unsigned long flags;
 
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                 v->counter += i;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
         }
 }
 
@@ -124,9 +124,9 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
         } else {
                 unsigned long flags;
 
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                 v->counter -= i;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
         }
 }
 
@@ -173,11 +173,11 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
         } else {
                 unsigned long flags;
 
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                 result = v->counter;
                 result += i;
                 v->counter = result;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
         }
 
         smp_mb();
@@ -225,11 +225,11 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
         } else {
                 unsigned long flags;
 
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                 result = v->counter;
                 result -= i;
                 v->counter = result;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
         }
 
         smp_mb();
@@ -293,12 +293,12 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
         } else {
                 unsigned long flags;
 
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                 result = v->counter;
                 result -= i;
                 if (result >= 0)
                         v->counter = result;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
         }
 
         smp_mb();
@@ -454,9 +454,9 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
         } else {
                 unsigned long flags;
 
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                 v->counter += i;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
         }
 }
 
@@ -499,9 +499,9 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
         } else {
                 unsigned long flags;
 
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                 v->counter -= i;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
         }
 }
 
@@ -548,11 +548,11 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
         } else {
                 unsigned long flags;
 
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                 result = v->counter;
                 result += i;
                 v->counter = result;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
         }
 
         smp_mb();
@@ -600,11 +600,11 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
         } else {
                 unsigned long flags;
 
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                 result = v->counter;
                 result -= i;
                 v->counter = result;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
         }
 
         smp_mb();
@@ -668,12 +668,12 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
         } else {
                 unsigned long flags;
 
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                 result = v->counter;
                 result -= i;
                 if (result >= 0)
                         v->counter = result;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
         }
 
         smp_mb();