Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/arm/lib/io-readsb.S b/arch/arm/lib/io-readsb.S
index 081ef74..d3d8de7 100644 (file)
--- a/arch/arm/lib/io-readsb.S
+++ b/arch/arm/lib/io-readsb.S
@@ -10,7 +10,7 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 
-.insb_align:   rsb     ip, ip, #4
+.Linsb_align:  rsb     ip, ip, #4
                cmp     ip, r2
                movgt   ip, r2
                cmp     ip, #2
@@ -21,20 +21,20 @@
                ldrgtb  r3, [r0]
                strgtb  r3, [r1], #1
                subs    r2, r2, ip
-               bne     .insb_aligned
+               bne     .Linsb_aligned
 
 ENTRY(__raw_readsb)
                teq     r2, #0          @ do we have to check for the zero len?
                moveq   pc, lr
                ands    ip, r1, #3
-               bne     .insb_align
+               bne     .Linsb_align
 
-.insb_aligned: stmfd   sp!, {r4 - r6, lr}
+.Linsb_aligned:        stmfd   sp!, {r4 - r6, lr}
 
                subs    r2, r2, #16
-               bmi     .insb_no_16
+               bmi     .Linsb_no_16
 
-.insb_16_lp:   ldrb    r3, [r0]
+.Linsb_16_lp:  ldrb    r3, [r0]
                ldrb    r4, [r0]
                ldrb    r5, [r0]
                mov     r3, r3,     put_byte_0
@@ -69,13 +69,13 @@ ENTRY(__raw_readsb)
                stmia   r1!, {r3 - r6}
 
                subs    r2, r2, #16
-               bpl     .insb_16_lp
+               bpl     .Linsb_16_lp
 
                tst     r2, #15
                LOADREGS(eqfd, sp!, {r4 - r6, pc})
 
-.insb_no_16:   tst     r2, #8
-               beq     .insb_no_8
+.Linsb_no_16:  tst     r2, #8
+               beq     .Linsb_no_8
 
                ldrb    r3, [r0]
                ldrb    r4, [r0]
@@ -95,8 +95,8 @@ ENTRY(__raw_readsb)
                orr     r4, r4, ip, put_byte_3
                stmia   r1!, {r3, r4}
 
-.insb_no_8:    tst     r2, #4
-               beq     .insb_no_4
+.Linsb_no_8:   tst     r2, #4
+               beq     .Linsb_no_4
 
                ldrb    r3, [r0]
                ldrb    r4, [r0]
@@ -108,7 +108,7 @@ ENTRY(__raw_readsb)
                orr     r3, r3, r6, put_byte_3
                str     r3, [r1], #4
 
-.insb_no_4:    ands    r2, r2, #3
+.Linsb_no_4:   ands    r2, r2, #3
                LOADREGS(eqfd, sp!, {r4 - r6, pc})
 
                cmp     r2, #2