leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bitops: Change the bitmap index from int to unsigned long [mn10300]

Browse Source 
Change the index to unsigned long in all bitops for [mn10300]

Signed-off-by: Justin Chen <justin.chen@hp.com>
Reviewed-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: David Howells <dhowells@redhat.com>
This commit is contained in:
Justin Chen 2010-10-27 17:28:34 +01:00 committed by David Howells
parent 292aa14127
commit e4acfcac0f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/mn10300/include/asm/bitops.h
View File

@ -57,7 +57,7 @@
#define clear_bit(nr, addr) ___clear_bit((nr), (addr)) #define clear_bit(nr, addr) ___clear_bit((nr), (addr))
static inline void __clear_bit(int nr, volatile void *addr) static inline void __clear_bit(unsigned long nr, volatile void *addr)
{ {
unsigned int *a = (unsigned int *) addr; unsigned int *a = (unsigned int *) addr;
int mask; int mask;
@ -70,7 +70,7 @@ static inline void __clear_bit(int nr, volatile void *addr)
/* /*
* test bit * test bit
*/ */
static inline int test_bit(int nr, const volatile void *addr) static inline int test_bit(unsigned long nr, const volatile void *addr)
{ {
return 1UL & (((const unsigned int *) addr)[nr >> 5] >> (nr & 31)); return 1UL & (((const unsigned int *) addr)[nr >> 5] >> (nr & 31));
} }
@ -78,7 +78,7 @@ static inline int test_bit(int nr, const volatile void *addr)
/* /*
* change bit * change bit
*/ */
static inline void __change_bit(int nr, volatile void *addr) static inline void __change_bit(unsigned long nr, volatile void *addr)
{ {
int mask; int mask;
unsigned int *a = (unsigned int *) addr; unsigned int *a = (unsigned int *) addr;
@ -88,7 +88,7 @@ static inline void __change_bit(int nr, volatile void *addr)
*a ^= mask; *a ^= mask;
} }
extern void change_bit(int nr, volatile void *addr); extern void change_bit(unsigned long nr, volatile void *addr);
/* /*
* test and set bit * test and set bit
@ -135,7 +135,7 @@ extern void change_bit(int nr, volatile void *addr);
/* /*
* test and change bit * test and change bit
*/ */
static inline int __test_and_change_bit(int nr, volatile void *addr) static inline int __test_and_change_bit(unsigned long nr, volatile void *addr)
{ {
int mask, retval; int mask, retval;
unsigned int *a = (unsigned int *)addr; unsigned int *a = (unsigned int *)addr;
@ -148,7 +148,7 @@ static inline int __test_and_change_bit(int nr, volatile void *addr)
return retval; return retval;
} }
extern int test_and_change_bit(int nr, volatile void *addr); extern int test_and_change_bit(unsigned long nr, volatile void *addr);
#include <asm-generic/bitops/lock.h> #include <asm-generic/bitops/lock.h>

4
arch/mn10300/lib/bitops.c
View File

@ -15,7 +15,7 @@
/* /*
* try flipping a bit using BSET and BCLR * try flipping a bit using BSET and BCLR
*/ */
void change_bit(int nr, volatile void *addr) void change_bit(unsigned long nr, volatile void *addr)
{ {
if (test_bit(nr, addr)) if (test_bit(nr, addr))
goto try_clear_bit; goto try_clear_bit;
@ -34,7 +34,7 @@ try_clear_bit:
/* /*
* try flipping a bit using BSET and BCLR and returning the old value * try flipping a bit using BSET and BCLR and returning the old value
*/ */
int test_and_change_bit(int nr, volatile void *addr) int test_and_change_bit(unsigned long nr, volatile void *addr)
{ {
if (test_bit(nr, addr)) if (test_bit(nr, addr))
goto try_clear_bit; goto try_clear_bit;