OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Lennert Buytenhek 2006-09-21 03:35:20 +01:00 committed by Russell King
parent 0c92e830bd
commit e7cc2c59cc
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/asm-arm/bitops.h
View File

@ -37,9 +37,9 @@ static inline void ____atomic_set_bit(unsigned int bit, volatile unsigned long *
p += bit >> 5; p += bit >> 5;
local_irq_save(flags); raw_local_irq_save(flags);
*p |= mask; *p |= mask;
local_irq_restore(flags); raw_local_irq_restore(flags);
} }
static inline void ____atomic_clear_bit(unsigned int bit, volatile unsigned long *p) 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; p += bit >> 5;
local_irq_save(flags); raw_local_irq_save(flags);
*p &= ~mask; *p &= ~mask;
local_irq_restore(flags); raw_local_irq_restore(flags);
} }
static inline void ____atomic_change_bit(unsigned int bit, volatile unsigned long *p) 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; p += bit >> 5;
local_irq_save(flags); raw_local_irq_save(flags);
*p ^= mask; *p ^= mask;
local_irq_restore(flags); raw_local_irq_restore(flags);
} }
static inline int static inline int
@ -75,10 +75,10 @@ ____atomic_test_and_set_bit(unsigned int bit, volatile unsigned long *p)
p += bit >> 5; p += bit >> 5;
local_irq_save(flags); raw_local_irq_save(flags);
res = *p; res = *p;
*p = res | mask; *p = res | mask;
local_irq_restore(flags); raw_local_irq_restore(flags);
return res & mask; return res & mask;
} }
@ -92,10 +92,10 @@ ____atomic_test_and_clear_bit(unsigned int bit, volatile unsigned long *p)
p += bit >> 5; p += bit >> 5;
local_irq_save(flags); raw_local_irq_save(flags);
res = *p; res = *p;
*p = res & ~mask; *p = res & ~mask;
local_irq_restore(flags); raw_local_irq_restore(flags);
return res & mask; return res & mask;
} }
@ -109,10 +109,10 @@ ____atomic_test_and_change_bit(unsigned int bit, volatile unsigned long *p)
p += bit >> 5; p += bit >> 5;
local_irq_save(flags); raw_local_irq_save(flags);
res = *p; res = *p;
*p = res ^ mask; *p = res ^ mask;
local_irq_restore(flags); raw_local_irq_restore(flags);
return res & mask; return res & mask;
} }

8
include/asm-arm/system.h
View File

@ -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 #error SMP is not supported on this platform
#endif #endif
case 1: case 1:
local_irq_save(flags); raw_local_irq_save(flags);
ret = *(volatile unsigned char *)ptr; ret = *(volatile unsigned char *)ptr;
*(volatile unsigned char *)ptr = x; *(volatile unsigned char *)ptr = x;
local_irq_restore(flags); raw_local_irq_restore(flags);
break; break;
case 4: case 4:
local_irq_save(flags); raw_local_irq_save(flags);
ret = *(volatile unsigned long *)ptr; ret = *(volatile unsigned long *)ptr;
*(volatile unsigned long *)ptr = x; *(volatile unsigned long *)ptr = x;
local_irq_restore(flags); raw_local_irq_restore(flags);
break; break;
#else #else
case 1: case 1: