2 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
index 6f17187ab32a..7b595547c1c8 100644
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
@@ -18,10 +18,12 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/asm-offsets.h>
+#include <asm/assembler.h>
 #include <asm/vfpmacros.h>
 
         .globl  do_vfp
 do_vfp:
+        enable_irq
         ldr     r4, .LCvfp
         add     r10, r10, #TI_VFPSTATE  @ r10 = workspace
         ldr     pc, [r4]                @ call VFP entry point
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index de4ca1223c58..b7ed57e00cd4 100644
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -102,7 +102,6 @@ vfp_support_entry:
         VFPFMRX r8, FPINST2, NE         @ FPINST2 if needed - avoids reading
                                         @ nonexistant reg on rev0
         VFPFSTMIA r4                    @ save the working registers
-        add     r4, r4, #8*16+4
         stmia   r4, {r1, r5, r6, r8}    @ save FPEXC, FPSCR, FPINST, FPINST2
                                         @ and point r4 at the word at the
                                         @ start of the register dump
@@ -111,10 +110,9 @@ no_old_VFP_process:
         DBGSTR1 "load state %p", r10
         str     r10, [r3]               @ update the last_VFP_context pointer
                                         @ Load the saved state back into the VFP
-        add     r4, r10, #8*16+4
-        ldmia   r4, {r1, r5, r6, r8}    @ load FPEXC, FPSCR, FPINST, FPINST2
         VFPFLDMIA r10                   @ reload the working registers while
                                         @ FPEXC is in a safe state
+        ldmia   r10, {r1, r5, r6, r8}   @ load FPEXC, FPSCR, FPINST, FPINST2
         tst     r1, #FPEXC_FPV2         @ is there an FPINST2 to write?
         VFPFMXR FPINST2, r8, NE         @ FPINST2 if needed - avoids writing
                                         @ nonexistant reg on rev0