[PATCH 02/15] bitops: Change the bitmap index from int to unsigned long [arm]

[Justin Chen]

Change the index to unsigned long in all bitops for [arm]

Signed-off-by: Justin Chen <justin.chen@xxxxxx>
Reviewed-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
---
 arch/arm/include/asm/bitops.h |   36 ++++++++++++++++++------------------
 arch/arm/lib/changebit.S      |    2 +-
 arch/arm/lib/clearbit.S       |    2 +-
 arch/arm/lib/setbit.S         |    2 +-
 4 files changed, 24 insertions(+), 21 deletions(-)
diff -Nru a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h
--- a/arch/arm/include/asm/bitops.h	2009-02-22 20:19:40.000000000 -0800
+++ b/arch/arm/include/asm/bitops.h	2009-02-24 13:33:52.000000000 -0800
@@ -34,7 +34,7 @@
  *
  * First, the atomic bitops. These use native endian.
  */
-static inline void ____atomic_set_bit(unsigned int bit, volatile unsigned long *p)
+static inline void ____atomic_set_bit(unsigned long bit, volatile unsigned long *p)
 {
 	unsigned long flags;
 	unsigned long mask = 1UL << (bit & 31);
@@ -46,7 +46,7 @@
 	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 long bit, volatile unsigned long *p)
 {
 	unsigned long flags;
 	unsigned long mask = 1UL << (bit & 31);
@@ -58,7 +58,7 @@
 	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 long bit, volatile unsigned long *p)
 {
 	unsigned long flags;
 	unsigned long mask = 1UL << (bit & 31);
@@ -71,7 +71,7 @@
 }
 
 static inline int
-____atomic_test_and_set_bit(unsigned int bit, volatile unsigned long *p)
+____atomic_test_and_set_bit(unsigned long bit, volatile unsigned long *p)
 {
 	unsigned long flags;
 	unsigned int res;
@@ -88,7 +88,7 @@
 }
 
 static inline int
-____atomic_test_and_clear_bit(unsigned int bit, volatile unsigned long *p)
+____atomic_test_and_clear_bit(unsigned long bit, volatile unsigned long *p)
 {
 	unsigned long flags;
 	unsigned int res;
@@ -105,7 +105,7 @@
 }
 
 static inline int
-____atomic_test_and_change_bit(unsigned int bit, volatile unsigned long *p)
+____atomic_test_and_change_bit(unsigned long bit, volatile unsigned long *p)
 {
 	unsigned long flags;
 	unsigned int res;
@@ -151,12 +151,12 @@
 /*
  * Little endian assembly bitops.  nr = 0 -> byte 0 bit 0.
  */
-extern void _set_bit_le(int nr, volatile unsigned long * p);
-extern void _clear_bit_le(int nr, volatile unsigned long * p);
-extern void _change_bit_le(int nr, volatile unsigned long * p);
-extern int _test_and_set_bit_le(int nr, volatile unsigned long * p);
-extern int _test_and_clear_bit_le(int nr, volatile unsigned long * p);
-extern int _test_and_change_bit_le(int nr, volatile unsigned long * p);
+extern void _set_bit_le(unsigned long nr, volatile unsigned long * p);
+extern void _clear_bit_le(unsigned long nr, volatile unsigned long * p);
+extern void _change_bit_le(unsigned long nr, volatile unsigned long * p);
+extern int _test_and_set_bit_le(unsigned long nr, volatile unsigned long * p);
+extern int _test_and_clear_bit_le(unsigned long nr, volatile unsigned long * p);
+extern int _test_and_change_bit_le(unsigned long nr, volatile unsigned long * p);
 extern int _find_first_zero_bit_le(const void * p, unsigned size);
 extern int _find_next_zero_bit_le(const void * p, int size, int offset);
 extern int _find_first_bit_le(const unsigned long *p, unsigned size);
@@ -165,12 +165,12 @@
 /*
  * Big endian assembly bitops.  nr = 0 -> byte 3 bit 0.
  */
-extern void _set_bit_be(int nr, volatile unsigned long * p);
-extern void _clear_bit_be(int nr, volatile unsigned long * p);
-extern void _change_bit_be(int nr, volatile unsigned long * p);
-extern int _test_and_set_bit_be(int nr, volatile unsigned long * p);
-extern int _test_and_clear_bit_be(int nr, volatile unsigned long * p);
-extern int _test_and_change_bit_be(int nr, volatile unsigned long * p);
+extern void _set_bit_be(unsigned long nr, volatile unsigned long * p);
+extern void _clear_bit_be(unsigned long nr, volatile unsigned long * p);
+extern void _change_bit_be(unsigned long nr, volatile unsigned long * p);
+extern int _test_and_set_bit_be(unsigned long nr, volatile unsigned long * p);
+extern int _test_and_clear_bit_be(unsigned long nr, volatile unsigned long * p);
+extern int _test_and_change_bit_be(unsigned long nr, volatile unsigned long * p);
 extern int _find_first_zero_bit_be(const void * p, unsigned size);
 extern int _find_next_zero_bit_be(const void * p, int size, int offset);
 extern int _find_first_bit_be(const unsigned long *p, unsigned size);
diff -Nru a/arch/arm/lib/changebit.S b/arch/arm/lib/changebit.S
--- orig/arch/arm/lib/changebit.S	2009-02-22 20:19:40.000000000 -0800
+++ new/arch/arm/lib/changebit.S	2009-02-24 13:29:19.000000000 -0800
@@ -13,7 +13,7 @@
                 .text
 
 /* Purpose  : Function to change a bit
- * Prototype: int change_bit(int bit, void *addr)
+ * Prototype: int change_bit(unsigned long bit, void *addr)
  */
 ENTRY(_change_bit_be)
 		eor	r0, r0, #0x18		@ big endian byte ordering
diff -Nru a/arch/arm/lib/clearbit.S b/arch/arm/lib/clearbit.S
--- orig/arch/arm/lib/clearbit.S	2009-02-22 20:19:40.000000000 -0800
+++ new/arch/arm/lib/clearbit.S	2009-02-24 13:29:19.000000000 -0800
@@ -14,7 +14,7 @@
 
 /*
  * Purpose  : Function to clear a bit
- * Prototype: int clear_bit(int bit, void *addr)
+ * Prototype: int clear_bit(unsigned long bit, void *addr)
  */
 ENTRY(_clear_bit_be)
 		eor	r0, r0, #0x18		@ big endian byte ordering
diff -Nru a/arch/arm/lib/setbit.S b/arch/arm/lib/setbit.S
--- orig/arch/arm/lib/setbit.S	2009-02-22 20:19:40.000000000 -0800
+++ new/arch/arm/lib/setbit.S	2009-02-24 13:29:19.000000000 -0800
@@ -14,7 +14,7 @@
 
 /*
  * Purpose  : Function to set a bit
- * Prototype: int set_bit(int bit, void *addr)
+ * Prototype: int set_bit(unsigned long bit, void *addr)
  */
 ENTRY(_set_bit_be)
 		eor	r0, r0, #0x18		@ big endian byte ordering
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/