fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / arm / lib / findbit.S

diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S
index f055d56..a5ca024 100644 (file)
--- a/arch/arm/lib/findbit.S
+++ b/arch/arm/lib/findbit.S
@@ -27,12 +27,12 @@ ENTRY(_find_first_zero_bit_le)
                mov     r2, #0
 1:             ldrb    r3, [r0, r2, lsr #3]
                eors    r3, r3, #0xff           @ invert bits
-               bne     .found                  @ any now set - found zero bit
+               bne     .L_found                @ any now set - found zero bit
                add     r2, r2, #8              @ next bit pointer
 2:             cmp     r2, r1                  @ any more?
                blo     1b
 3:             mov     r0, r1                  @ no free bits
-               RETINSTR(mov,pc,lr)
+               mov     pc, lr
 
 /*
  * Purpose  : Find next 'zero' bit
@@ -46,7 +46,7 @@ ENTRY(_find_next_zero_bit_le)
                ldrb    r3, [r0, r2, lsr #3]
                eor     r3, r3, #0xff           @ now looking for a 1 bit
                movs    r3, r3, lsr ip          @ shift off unused bits
-               bne     .found
+               bne     .L_found
                orr     r2, r2, #7              @ if zero, then no bits here
                add     r2, r2, #1              @ align bit pointer
                b       2b                      @ loop for next bit
@@ -61,12 +61,12 @@ ENTRY(_find_first_bit_le)
                mov     r2, #0
 1:             ldrb    r3, [r0, r2, lsr #3]
                movs    r3, r3
-               bne     .found                  @ any now set - found zero bit
+               bne     .L_found                @ any now set - found zero bit
                add     r2, r2, #8              @ next bit pointer
 2:             cmp     r2, r1                  @ any more?
                blo     1b
 3:             mov     r0, r1                  @ no free bits
-               RETINSTR(mov,pc,lr)
+               mov     pc, lr
 
 /*
  * Purpose  : Find next 'one' bit
@@ -79,7 +79,7 @@ ENTRY(_find_next_bit_le)
                beq     1b                      @ If new byte, goto old routine
                ldrb    r3, [r0, r2, lsr #3]
                movs    r3, r3, lsr ip          @ shift off unused bits
-               bne     .found
+               bne     .L_found
                orr     r2, r2, #7              @ if zero, then no bits here
                add     r2, r2, #1              @ align bit pointer
                b       2b                      @ loop for next bit
@@ -93,12 +93,12 @@ ENTRY(_find_first_zero_bit_be)
 1:             eor     r3, r2, #0x18           @ big endian byte ordering
                ldrb    r3, [r0, r3, lsr #3]
                eors    r3, r3, #0xff           @ invert bits
-               bne     .found                  @ any now set - found zero bit
+               bne     .L_found                @ any now set - found zero bit
                add     r2, r2, #8              @ next bit pointer
 2:             cmp     r2, r1                  @ any more?
                blo     1b
 3:             mov     r0, r1                  @ no free bits
-               RETINSTR(mov,pc,lr)
+               mov     pc, lr
 
 ENTRY(_find_next_zero_bit_be)
                teq     r1, #0
@@ -109,7 +109,7 @@ ENTRY(_find_next_zero_bit_be)
                ldrb    r3, [r0, r3, lsr #3]
                eor     r3, r3, #0xff           @ now looking for a 1 bit
                movs    r3, r3, lsr ip          @ shift off unused bits
-               bne     .found
+               bne     .L_found
                orr     r2, r2, #7              @ if zero, then no bits here
                add     r2, r2, #1              @ align bit pointer
                b       2b                      @ loop for next bit
@@ -121,12 +121,12 @@ ENTRY(_find_first_bit_be)
 1:             eor     r3, r2, #0x18           @ big endian byte ordering
                ldrb    r3, [r0, r3, lsr #3]
                movs    r3, r3
-               bne     .found                  @ any now set - found zero bit
+               bne     .L_found                @ any now set - found zero bit
                add     r2, r2, #8              @ next bit pointer
 2:             cmp     r2, r1                  @ any more?
                blo     1b
 3:             mov     r0, r1                  @ no free bits
-               RETINSTR(mov,pc,lr)
+               mov     pc, lr
 
 ENTRY(_find_next_bit_be)
                teq     r1, #0
@@ -136,7 +136,7 @@ ENTRY(_find_next_bit_be)
                eor     r3, r2, #0x18           @ big endian byte ordering
                ldrb    r3, [r0, r3, lsr #3]
                movs    r3, r3, lsr ip          @ shift off unused bits
-               bne     .found
+               bne     .L_found
                orr     r2, r2, #7              @ if zero, then no bits here
                add     r2, r2, #1              @ align bit pointer
                b       2b                      @ loop for next bit
@@ -146,7 +146,7 @@ ENTRY(_find_next_bit_be)
 /*
  * One or more bits in the LSB of r3 are assumed to be set.
  */
-.found:
+.L_found:
 #if __LINUX_ARM_ARCH__ >= 5
                rsb     r1, r3, #0
                and     r3, r3, r1
@@ -164,5 +164,5 @@ ENTRY(_find_next_bit_be)
                addeq   r2, r2, #1
                mov     r0, r2
 #endif
-               RETINSTR(mov,pc,lr)
+               mov     pc, lr