Commit e7cc2c59 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 3852/1: convert atomic bitops and __xchg over to raw_local_irq_{save,restore}



Thomas Gleixner noticed that bitops.h should also use the raw_* irq
disable/enable variants, and __xchg needs them as well.
Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0c92e830
......@@ -37,9 +37,9 @@ static inline void ____atomic_set_bit(unsigned int bit, volatile unsigned long *
p += bit >> 5;
local_irq_save(flags);
raw_local_irq_save(flags);
*p |= mask;
local_irq_restore(flags);
raw_local_irq_restore(flags);
}
static inline void ____atomic_clear_bit(unsigned int bit, volatile unsigned long *p)
......@@ -49,9 +49,9 @@ static inline void ____atomic_clear_bit(unsigned int bit, volatile unsigned long
p += bit >> 5;
local_irq_save(flags);
raw_local_irq_save(flags);
*p &= ~mask;
local_irq_restore(flags);
raw_local_irq_restore(flags);
}
static inline void ____atomic_change_bit(unsigned int bit, volatile unsigned long *p)
......@@ -61,9 +61,9 @@ static inline void ____atomic_change_bit(unsigned int bit, volatile unsigned lon
p += bit >> 5;
local_irq_save(flags);
raw_local_irq_save(flags);
*p ^= mask;
local_irq_restore(flags);
raw_local_irq_restore(flags);
}
static inline int
......@@ -75,10 +75,10 @@ ____atomic_test_and_set_bit(unsigned int bit, volatile unsigned long *p)
p += bit >> 5;
local_irq_save(flags);
raw_local_irq_save(flags);
res = *p;
*p = res | mask;
local_irq_restore(flags);
raw_local_irq_restore(flags);
return res & mask;
}
......@@ -92,10 +92,10 @@ ____atomic_test_and_clear_bit(unsigned int bit, volatile unsigned long *p)
p += bit >> 5;
local_irq_save(flags);
raw_local_irq_save(flags);
res = *p;
*p = res & ~mask;
local_irq_restore(flags);
raw_local_irq_restore(flags);
return res & mask;
}
......@@ -109,10 +109,10 @@ ____atomic_test_and_change_bit(unsigned int bit, volatile unsigned long *p)
p += bit >> 5;
local_irq_save(flags);
raw_local_irq_save(flags);
res = *p;
*p = res ^ mask;
local_irq_restore(flags);
raw_local_irq_restore(flags);
return res & mask;
}
......
......@@ -282,17 +282,17 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
#error SMP is not supported on this platform
#endif
case 1:
local_irq_save(flags);
raw_local_irq_save(flags);
ret = *(volatile unsigned char *)ptr;
*(volatile unsigned char *)ptr = x;
local_irq_restore(flags);
raw_local_irq_restore(flags);
break;
case 4:
local_irq_save(flags);
raw_local_irq_save(flags);
ret = *(volatile unsigned long *)ptr;
*(volatile unsigned long *)ptr = x;
local_irq_restore(flags);
raw_local_irq_restore(flags);
break;
#else
case 1:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment