Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[linux-2.6-omap-h63xx.git] / arch / blackfin / include / asm / bitops.h

diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h
index 9964e17232e9104e5ea37d7a18a8768f7684c570..21b036eadab1d4e8450499c2c9c097f0f0546495 100644 (file)
--- a/arch/blackfin/include/asm/bitops.h
+++ b/arch/blackfin/include/asm/bitops.h
@@ -90,9 +90,9 @@ static inline void set_bit(int nr, volatile unsigned long *addr)
        unsigned long flags;
        a += nr >> 5;
        mask = 1 << (nr & 0x1f);
-       local_irq_save(flags);
+       local_irq_save_hw(flags);
        *a |= mask;
-       local_irq_restore(flags);
+       local_irq_restore_hw(flags);
 }
 
 static inline void clear_bit(int nr, volatile unsigned long *addr)
@@ -102,9 +102,9 @@ static inline void clear_bit(int nr, volatile unsigned long *addr)
        unsigned long flags;
        a += nr >> 5;
        mask = 1 << (nr & 0x1f);
-       local_irq_save(flags);
+       local_irq_save_hw(flags);
        *a &= ~mask;
-       local_irq_restore(flags);
+       local_irq_restore_hw(flags);
 }
 
 static inline void change_bit(int nr, volatile unsigned long *addr)
@@ -114,9 +114,9 @@ static inline void change_bit(int nr, volatile unsigned long *addr)
 
        ADDR += nr >> 5;
        mask = 1 << (nr & 31);
-       local_irq_save(flags);
+       local_irq_save_hw(flags);
        *ADDR ^= mask;
-       local_irq_restore(flags);
+       local_irq_restore_hw(flags);
 }
 
 static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
@@ -127,10 +127,10 @@ static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
 
        a += nr >> 5;
        mask = 1 << (nr & 0x1f);
-       local_irq_save(flags);
+       local_irq_save_hw(flags);
        retval = (mask & *a) != 0;
        *a |= mask;
-       local_irq_restore(flags);
+       local_irq_restore_hw(flags);
 
        return retval;
 }
@@ -143,10 +143,10 @@ static inline int test_and_clear_bit(int nr, volatile unsigned long *addr)
 
        a += nr >> 5;
        mask = 1 << (nr & 0x1f);
-       local_irq_save(flags);
+       local_irq_save_hw(flags);
        retval = (mask & *a) != 0;
        *a &= ~mask;
-       local_irq_restore(flags);
+       local_irq_restore_hw(flags);
 
        return retval;
 }
@@ -159,10 +159,10 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
 
        a += nr >> 5;
        mask = 1 << (nr & 0x1f);
-       local_irq_save(flags);
+       local_irq_save_hw(flags);
        retval = (mask & *a) != 0;
        *a ^= mask;
-       local_irq_restore(flags);
+       local_irq_restore_hw(flags);
        return retval;
 }