Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / include / asm-mips / bitops.h

diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h
index 8959da245cfbb751d77b2186870a98ca1816301a..d995413e11fd87af0844e82b6d10c90e3324b60b 100644 (file)
--- a/include/asm-mips/bitops.h
+++ b/include/asm-mips/bitops.h
@@ -100,9 +100,9 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr)
 
                a += nr >> SZLONG_LOG;
                mask = 1UL << bit;
-               local_irq_save(flags);
+               raw_local_irq_save(flags);
                *a |= mask;
-               local_irq_restore(flags);
+               raw_local_irq_restore(flags);
        }
 }
 
@@ -165,9 +165,9 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *addr)
 
                a += nr >> SZLONG_LOG;
                mask = 1UL << bit;
-               local_irq_save(flags);
+               raw_local_irq_save(flags);
                *a &= ~mask;
-               local_irq_restore(flags);
+               raw_local_irq_restore(flags);
        }
 }
 
@@ -220,9 +220,9 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
 
                a += nr >> SZLONG_LOG;
                mask = 1UL << bit;
-               local_irq_save(flags);
+               raw_local_irq_save(flags);
                *a ^= mask;
-               local_irq_restore(flags);
+               raw_local_irq_restore(flags);
        }
 }
 
@@ -287,10 +287,10 @@ static inline int test_and_set_bit(unsigned long nr,
 
                a += nr >> SZLONG_LOG;
                mask = 1UL << bit;
-               local_irq_save(flags);
+               raw_local_irq_save(flags);
                retval = (mask & *a) != 0;
                *a |= mask;
-               local_irq_restore(flags);
+               raw_local_irq_restore(flags);
 
                return retval;
        }
@@ -381,10 +381,10 @@ static inline int test_and_clear_bit(unsigned long nr,
 
                a += nr >> SZLONG_LOG;
                mask = 1UL << bit;
-               local_irq_save(flags);
+               raw_local_irq_save(flags);
                retval = (mask & *a) != 0;
                *a &= ~mask;
-               local_irq_restore(flags);
+               raw_local_irq_restore(flags);
 
                return retval;
        }
@@ -452,10 +452,10 @@ static inline int test_and_change_bit(unsigned long nr,
 
                a += nr >> SZLONG_LOG;
                mask = 1UL << bit;
-               local_irq_save(flags);
+               raw_local_irq_save(flags);
                retval = (mask & *a) != 0;
                *a ^= mask;
-               local_irq_restore(flags);
+               raw_local_irq_restore(flags);
 
                return retval;
        }