|
@@ -37,7 +37,7 @@
|
|
* Note that @nr may be almost arbitrarily large; this function is not
|
|
* Note that @nr may be almost arbitrarily large; this function is not
|
|
* restricted to acting on a single-word quantity.
|
|
* restricted to acting on a single-word quantity.
|
|
*/
|
|
*/
|
|
-static inline void set_bit(int nr, volatile unsigned long * addr)
|
|
|
|
|
|
+static inline void set_bit(int nr, volatile unsigned long *addr)
|
|
{
|
|
{
|
|
__asm__ __volatile__( LOCK_PREFIX
|
|
__asm__ __volatile__( LOCK_PREFIX
|
|
"btsl %1,%0"
|
|
"btsl %1,%0"
|
|
@@ -54,7 +54,7 @@ static inline void set_bit(int nr, volatile unsigned long * addr)
|
|
* If it's called on the same region of memory simultaneously, the effect
|
|
* If it's called on the same region of memory simultaneously, the effect
|
|
* may be that only one operation succeeds.
|
|
* may be that only one operation succeeds.
|
|
*/
|
|
*/
|
|
-static inline void __set_bit(int nr, volatile unsigned long * addr)
|
|
|
|
|
|
+static inline void __set_bit(int nr, volatile unsigned long *addr)
|
|
{
|
|
{
|
|
__asm__(
|
|
__asm__(
|
|
"btsl %1,%0"
|
|
"btsl %1,%0"
|
|
@@ -72,7 +72,7 @@ static inline void __set_bit(int nr, volatile unsigned long * addr)
|
|
* you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit()
|
|
* you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit()
|
|
* in order to ensure changes are visible on other processors.
|
|
* in order to ensure changes are visible on other processors.
|
|
*/
|
|
*/
|
|
-static inline void clear_bit(int nr, volatile unsigned long * addr)
|
|
|
|
|
|
+static inline void clear_bit(int nr, volatile unsigned long *addr)
|
|
{
|
|
{
|
|
__asm__ __volatile__( LOCK_PREFIX
|
|
__asm__ __volatile__( LOCK_PREFIX
|
|
"btrl %1,%0"
|
|
"btrl %1,%0"
|
|
@@ -94,7 +94,7 @@ static inline void clear_bit_unlock(unsigned long nr, volatile unsigned long *ad
|
|
clear_bit(nr, addr);
|
|
clear_bit(nr, addr);
|
|
}
|
|
}
|
|
|
|
|
|
-static inline void __clear_bit(int nr, volatile unsigned long * addr)
|
|
|
|
|
|
+static inline void __clear_bit(int nr, volatile unsigned long *addr)
|
|
{
|
|
{
|
|
__asm__ __volatile__(
|
|
__asm__ __volatile__(
|
|
"btrl %1,%0"
|
|
"btrl %1,%0"
|
|
@@ -132,7 +132,7 @@ static inline void __clear_bit_unlock(unsigned long nr, volatile unsigned long *
|
|
* If it's called on the same region of memory simultaneously, the effect
|
|
* If it's called on the same region of memory simultaneously, the effect
|
|
* may be that only one operation succeeds.
|
|
* may be that only one operation succeeds.
|
|
*/
|
|
*/
|
|
-static inline void __change_bit(int nr, volatile unsigned long * addr)
|
|
|
|
|
|
+static inline void __change_bit(int nr, volatile unsigned long *addr)
|
|
{
|
|
{
|
|
__asm__ __volatile__(
|
|
__asm__ __volatile__(
|
|
"btcl %1,%0"
|
|
"btcl %1,%0"
|
|
@@ -150,7 +150,7 @@ static inline void __change_bit(int nr, volatile unsigned long * addr)
|
|
* Note that @nr may be almost arbitrarily large; this function is not
|
|
* Note that @nr may be almost arbitrarily large; this function is not
|
|
* restricted to acting on a single-word quantity.
|
|
* restricted to acting on a single-word quantity.
|
|
*/
|
|
*/
|
|
-static inline void change_bit(int nr, volatile unsigned long * addr)
|
|
|
|
|
|
+static inline void change_bit(int nr, volatile unsigned long *addr)
|
|
{
|
|
{
|
|
__asm__ __volatile__( LOCK_PREFIX
|
|
__asm__ __volatile__( LOCK_PREFIX
|
|
"btcl %1,%0"
|
|
"btcl %1,%0"
|
|
@@ -167,7 +167,7 @@ static inline void change_bit(int nr, volatile unsigned long * addr)
|
|
* It may be reordered on other architectures than x86.
|
|
* It may be reordered on other architectures than x86.
|
|
* It also implies a memory barrier.
|
|
* It also implies a memory barrier.
|
|
*/
|
|
*/
|
|
-static inline int test_and_set_bit(int nr, volatile unsigned long * addr)
|
|
|
|
|
|
+static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
|
|
{
|
|
{
|
|
int oldbit;
|
|
int oldbit;
|
|
|
|
|
|
@@ -199,7 +199,7 @@ static inline int test_and_set_bit_lock(int nr, volatile unsigned long *addr)
|
|
* If two examples of this operation race, one can appear to succeed
|
|
* If two examples of this operation race, one can appear to succeed
|
|
* but actually fail. You must protect multiple accesses with a lock.
|
|
* but actually fail. You must protect multiple accesses with a lock.
|
|
*/
|
|
*/
|
|
-static inline int __test_and_set_bit(int nr, volatile unsigned long * addr)
|
|
|
|
|
|
+static inline int __test_and_set_bit(int nr, volatile unsigned long *addr)
|
|
{
|
|
{
|
|
int oldbit;
|
|
int oldbit;
|
|
|
|
|
|
@@ -219,7 +219,7 @@ static inline int __test_and_set_bit(int nr, volatile unsigned long * addr)
|
|
* It can be reorderdered on other architectures other than x86.
|
|
* It can be reorderdered on other architectures other than x86.
|
|
* It also implies a memory barrier.
|
|
* It also implies a memory barrier.
|
|
*/
|
|
*/
|
|
-static inline int test_and_clear_bit(int nr, volatile unsigned long * addr)
|
|
|
|
|
|
+static inline int test_and_clear_bit(int nr, volatile unsigned long *addr)
|
|
{
|
|
{
|
|
int oldbit;
|
|
int oldbit;
|
|
|
|
|
|
@@ -270,7 +270,7 @@ static inline int __test_and_change_bit(int nr, volatile unsigned long *addr)
|
|
* This operation is atomic and cannot be reordered.
|
|
* This operation is atomic and cannot be reordered.
|
|
* It also implies a memory barrier.
|
|
* It also implies a memory barrier.
|
|
*/
|
|
*/
|
|
-static inline int test_and_change_bit(int nr, volatile unsigned long* addr)
|
|
|
|
|
|
+static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
|
|
{
|
|
{
|
|
int oldbit;
|
|
int oldbit;
|
|
|
|
|
|
@@ -287,7 +287,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long* addr)
|
|
* @nr: bit number to test
|
|
* @nr: bit number to test
|
|
* @addr: Address to start counting from
|
|
* @addr: Address to start counting from
|
|
*/
|
|
*/
|
|
-static int test_bit(int nr, const volatile void * addr);
|
|
|
|
|
|
+static int test_bit(int nr, const volatile void *addr);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
static __always_inline int constant_test_bit(int nr, const volatile unsigned long *addr)
|
|
static __always_inline int constant_test_bit(int nr, const volatile unsigned long *addr)
|
|
@@ -295,7 +295,7 @@ static __always_inline int constant_test_bit(int nr, const volatile unsigned lon
|
|
return ((1UL << (nr & 31)) & (addr[nr >> 5])) != 0;
|
|
return ((1UL << (nr & 31)) & (addr[nr >> 5])) != 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static inline int variable_test_bit(int nr, const volatile unsigned long * addr)
|
|
|
|
|
|
+static inline int variable_test_bit(int nr, const volatile unsigned long *addr)
|
|
{
|
|
{
|
|
int oldbit;
|
|
int oldbit;
|
|
|
|
|
|
@@ -306,10 +306,10 @@ static inline int variable_test_bit(int nr, const volatile unsigned long * addr)
|
|
return oldbit;
|
|
return oldbit;
|
|
}
|
|
}
|
|
|
|
|
|
-#define test_bit(nr,addr) \
|
|
|
|
-(__builtin_constant_p(nr) ? \
|
|
|
|
- constant_test_bit((nr),(addr)) : \
|
|
|
|
- variable_test_bit((nr),(addr)))
|
|
|
|
|
|
+#define test_bit(nr, addr) \
|
|
|
|
+ (__builtin_constant_p(nr) ? \
|
|
|
|
+ constant_test_bit((nr), (addr)) : \
|
|
|
|
+ variable_test_bit((nr), (addr)))
|
|
|
|
|
|
#undef ADDR
|
|
#undef ADDR
|
|
|
|
|
|
@@ -318,7 +318,7 @@ static inline int variable_test_bit(int nr, const volatile unsigned long * addr)
|
|
* @addr: The address to start the search at
|
|
* @addr: The address to start the search at
|
|
* @size: The maximum size to search
|
|
* @size: The maximum size to search
|
|
*
|
|
*
|
|
- * Returns the bit-number of the first zero bit, not the number of the byte
|
|
|
|
|
|
+ * Returns the bit number of the first zero bit, not the number of the byte
|
|
* containing a bit.
|
|
* containing a bit.
|
|
*/
|
|
*/
|
|
static inline int find_first_zero_bit(const unsigned long *addr, unsigned size)
|
|
static inline int find_first_zero_bit(const unsigned long *addr, unsigned size)
|
|
@@ -348,7 +348,7 @@ static inline int find_first_zero_bit(const unsigned long *addr, unsigned size)
|
|
/**
|
|
/**
|
|
* find_next_zero_bit - find the first zero bit in a memory region
|
|
* find_next_zero_bit - find the first zero bit in a memory region
|
|
* @addr: The address to base the search on
|
|
* @addr: The address to base the search on
|
|
- * @offset: The bitnumber to start searching at
|
|
|
|
|
|
+ * @offset: The bit number to start searching at
|
|
* @size: The maximum size to search
|
|
* @size: The maximum size to search
|
|
*/
|
|
*/
|
|
int find_next_zero_bit(const unsigned long *addr, int size, int offset);
|
|
int find_next_zero_bit(const unsigned long *addr, int size, int offset);
|
|
@@ -372,7 +372,7 @@ static inline unsigned long __ffs(unsigned long word)
|
|
* @addr: The address to start the search at
|
|
* @addr: The address to start the search at
|
|
* @size: The maximum size to search
|
|
* @size: The maximum size to search
|
|
*
|
|
*
|
|
- * Returns the bit-number of the first set bit, not the number of the byte
|
|
|
|
|
|
+ * Returns the bit number of the first set bit, not the number of the byte
|
|
* containing a bit.
|
|
* containing a bit.
|
|
*/
|
|
*/
|
|
static inline unsigned find_first_bit(const unsigned long *addr, unsigned size)
|
|
static inline unsigned find_first_bit(const unsigned long *addr, unsigned size)
|
|
@@ -391,7 +391,7 @@ static inline unsigned find_first_bit(const unsigned long *addr, unsigned size)
|
|
/**
|
|
/**
|
|
* find_next_bit - find the first set bit in a memory region
|
|
* find_next_bit - find the first set bit in a memory region
|
|
* @addr: The address to base the search on
|
|
* @addr: The address to base the search on
|
|
- * @offset: The bitnumber to start searching at
|
|
|
|
|
|
+ * @offset: The bit number to start searching at
|
|
* @size: The maximum size to search
|
|
* @size: The maximum size to search
|
|
*/
|
|
*/
|
|
int find_next_bit(const unsigned long *addr, int size, int offset);
|
|
int find_next_bit(const unsigned long *addr, int size, int offset);
|
|
@@ -460,10 +460,10 @@ static inline int fls(int x)
|
|
|
|
|
|
#include <asm-generic/bitops/ext2-non-atomic.h>
|
|
#include <asm-generic/bitops/ext2-non-atomic.h>
|
|
|
|
|
|
-#define ext2_set_bit_atomic(lock,nr,addr) \
|
|
|
|
- test_and_set_bit((nr),(unsigned long*)addr)
|
|
|
|
-#define ext2_clear_bit_atomic(lock,nr, addr) \
|
|
|
|
- test_and_clear_bit((nr),(unsigned long*)addr)
|
|
|
|
|
|
+#define ext2_set_bit_atomic(lock, nr, addr) \
|
|
|
|
+ test_and_set_bit((nr), (unsigned long *)addr)
|
|
|
|
+#define ext2_clear_bit_atomic(lock, nr, addr) \
|
|
|
|
+ test_and_clear_bit((nr), (unsigned long *)addr)
|
|
|
|
|
|
#include <asm-generic/bitops/minix.h>
|
|
#include <asm-generic/bitops/minix.h>
|
|
|
|
|