fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/arch/arm/lib/ecard.S b/arch/arm/lib/ecard.S
index f71a44a..c55aaa2 100644 (file)
--- a/arch/arm/lib/ecard.S
+++ b/arch/arm/lib/ecard.S
@@ -16,7 +16,7 @@
 
 #define CPSR2SPSR(rt) \
                mrs     rt, cpsr; \
-               msr     spsr, rt
+               msr     spsr_cxsf, rt
 
 @ Purpose: call an expansion card loader to read bytes.
 @ Proto  : char read_loader(int offset, char *card_base, char *loader);
@@ -29,7 +29,7 @@ ENTRY(ecard_loader_read)
                CPSR2SPSR(r0)
                mov     lr, pc
                mov     pc, r2
-               LOADREGS(fd, sp!, {r4 - r12, pc})
+               ldmfd   sp!, {r4 - r12, pc}
 
 @ Purpose: call an expansion card loader to reset the card
 @ Proto  : void read_loader(int card_base, char *loader);
@@ -41,5 +41,5 @@ ENTRY(ecard_loader_reset)
                CPSR2SPSR(r0)
                mov     lr, pc
                add     pc, r1, #8
-               LOADREGS(fd, sp!, {r4 - r12, pc})
+               ldmfd   sp!, {r4 - r12, pc}