Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[sfrench/cifs-2.6.git] / arch / arm / vfp / entry.S

diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
index a2bed62aec21900ba3b023c7a9c39a359ea123f1..4fa9903b83cf5dbb54a15623ec45fd00552d8521 100644 (file)
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
@@ -42,6 +42,7 @@ ENTRY(vfp_null_entry)
        mov     pc, lr
 ENDPROC(vfp_null_entry)
 
+       .align  2
 .LCvfp:
        .word   vfp_vector
 
@@ -61,6 +62,7 @@ ENTRY(vfp_testing_entry)
        mov     pc, r9                  @ we have handled the fault
 ENDPROC(vfp_testing_entry)
 
+       .align  2
 VFP_arch_address:
        .word   VFP_arch