Merge branch 'linus' into x86/signal

[pandora-kernel.git] / arch / arm / lib / io-writesb.S

diff --git a/arch/arm/lib/io-writesb.S b/arch/arm/lib/io-writesb.S
index 08209fc..68b92f4 100644 (file)
--- a/arch/arm/lib/io-writesb.S
+++ b/arch/arm/lib/io-writesb.S
@@ -64,7 +64,7 @@ ENTRY(__raw_writesb)
                bpl     .Loutsb_16_lp
 
                tst     r2, #15
-               LOADREGS(eqfd, sp!, {r4, r5, pc})
+               ldmeqfd sp!, {r4, r5, pc}
 
 .Loutsb_no_16: tst     r2, #8
                beq     .Loutsb_no_8
@@ -80,7 +80,7 @@ ENTRY(__raw_writesb)
                outword r3
 
 .Loutsb_no_4:  ands    r2, r2, #3
-               LOADREGS(eqfd, sp!, {r4, r5, pc})
+               ldmeqfd sp!, {r4, r5, pc}
 
                cmp     r2, #2
                ldrb    r3, [r1], #1
@@ -90,4 +90,5 @@ ENTRY(__raw_writesb)
                ldrgtb  r3, [r1]
                strgtb  r3, [r0]
 
-               LOADREGS(fd, sp!, {r4, r5, pc})
+               ldmfd   sp!, {r4, r5, pc}
+ENDPROC(__raw_writesb)