Merge tag 'v3.10.68' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / kernel / head.S

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index f935b5f651f0874166235444bc741af08a459b19..3a63c46be0ae889d113571ceec02e1f89197b1f2 100644 (file)
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -22,6 +22,7 @@
 #include <asm/memory.h>
 #include <asm/thread_info.h>
 #include <asm/pgtable.h>
+#include <asm/vfpmacros.h>
 
 #if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_SEMIHOSTING)
 #include CONFIG_DEBUG_LL_INCLUDE
@@ -344,6 +345,17 @@ __turn_mmu_on_loc:
 #if defined(CONFIG_SMP)
        __CPUINIT
 ENTRY(secondary_startup)
+#ifdef CONFIG_VFP_OPT
+       ldr     r10, =(0xF << 20)
+       mcr     p15, 0, r10, c1, c0, 2
+       VFPFMRX r10, FPEXC                      @ Is the VFP enabled?
+       orr     r10, r10, #FPEXC_EN             @ user FPEXC has the enable bit set
+       bic     r10, r10, #FPEXC_EX             @ make sure exceptions are disabled
+       VFPFMXR FPEXC, r10                      @ enable VFP, disable any pending
+                                               @ exceptions, so we can get at the
+                                               @ rest of it
+#endif
+
        /*
         * Common entry point for secondary CPUs.
         *