Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / mach-shmobile / headsmp-apmu.S

diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S
index 5672b58494016c6ac06a78cb4b00d6ff20feabc4..d49ab194766a401fb5642f269f01db39929ef9a5 100644 (file)
--- a/arch/arm/mach-shmobile/headsmp-apmu.S
+++ b/arch/arm/mach-shmobile/headsmp-apmu.S
@@ -11,29 +11,9 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 
-ENTRY(shmobile_init_cntvoff)
-       /*
-        * CNTVOFF has to be initialized either from non-secure Hypervisor
-        * mode or secure Monitor mode with SCR.NS==1. If TrustZone is enabled
-        * then it should be handled by the secure code
-        */
-       cps     #MON_MODE
-       mrc     p15, 0, r1, c1, c1, 0           /* Get Secure Config */
-       orr     r0, r1, #1
-       mcr     p15, 0, r0, c1, c1, 0           /* Set Non Secure bit */
-       instr_sync
-       mov     r0, #0
-       mcrr    p15, 4, r0, r0, c14             /* CNTVOFF = 0 */
-       instr_sync
-       mcr     p15, 0, r1, c1, c1, 0           /* Set Secure bit */
-       instr_sync
-       cps     #SVC_MODE
-       ret     lr
-ENDPROC(shmobile_init_cntvoff)
-
 #ifdef CONFIG_SMP
 ENTRY(shmobile_boot_apmu)
-       bl      shmobile_init_cntvoff
+       bl      secure_cntvoff_init
        b       secondary_startup
 ENDPROC(shmobile_boot_apmu)
 #endif