These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / include / asm / bitops.h

diff --git a/kernel/arch/arm/include/asm/bitops.h b/kernel/arch/arm/include/asm/bitops.h
index 5638099..e943e6c 100644 (file)
--- a/kernel/arch/arm/include/asm/bitops.h
+++ b/kernel/arch/arm/include/asm/bitops.h
@@ -35,9 +35,9 @@
 static inline void ____atomic_set_bit(unsigned int bit, volatile unsigned long *p)
 {
        unsigned long flags;
-       unsigned long mask = 1UL << (bit & 31);
+       unsigned long mask = BIT_MASK(bit);
 
-       p += bit >> 5;
+       p += BIT_WORD(bit);
 
        raw_local_irq_save(flags);
        *p |= mask;
@@ -47,9 +47,9 @@ static inline void ____atomic_set_bit(unsigned int bit, volatile unsigned long *
 static inline void ____atomic_clear_bit(unsigned int bit, volatile unsigned long *p)
 {
        unsigned long flags;
-       unsigned long mask = 1UL << (bit & 31);
+       unsigned long mask = BIT_MASK(bit);
 
-       p += bit >> 5;
+       p += BIT_WORD(bit);
 
        raw_local_irq_save(flags);
        *p &= ~mask;
@@ -59,9 +59,9 @@ static inline void ____atomic_clear_bit(unsigned int bit, volatile unsigned long
 static inline void ____atomic_change_bit(unsigned int bit, volatile unsigned long *p)
 {
        unsigned long flags;
-       unsigned long mask = 1UL << (bit & 31);
+       unsigned long mask = BIT_MASK(bit);
 
-       p += bit >> 5;
+       p += BIT_WORD(bit);
 
        raw_local_irq_save(flags);
        *p ^= mask;
@@ -73,9 +73,9 @@ ____atomic_test_and_set_bit(unsigned int bit, volatile unsigned long *p)
 {
        unsigned long flags;
        unsigned int res;
-       unsigned long mask = 1UL << (bit & 31);
+       unsigned long mask = BIT_MASK(bit);
 
-       p += bit >> 5;
+       p += BIT_WORD(bit);
 
        raw_local_irq_save(flags);
        res = *p;
@@ -90,9 +90,9 @@ ____atomic_test_and_clear_bit(unsigned int bit, volatile unsigned long *p)
 {
        unsigned long flags;
        unsigned int res;
-       unsigned long mask = 1UL << (bit & 31);
+       unsigned long mask = BIT_MASK(bit);
 
-       p += bit >> 5;
+       p += BIT_WORD(bit);
 
        raw_local_irq_save(flags);
        res = *p;
@@ -107,9 +107,9 @@ ____atomic_test_and_change_bit(unsigned int bit, volatile unsigned long *p)
 {
        unsigned long flags;
        unsigned int res;
-       unsigned long mask = 1UL << (bit & 31);
+       unsigned long mask = BIT_MASK(bit);
 
-       p += bit >> 5;
+       p += BIT_WORD(bit);
 
        raw_local_irq_save(flags);
        res = *p;