1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index 720aa0b3bee8..f1d8b9bbfdad 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -108,17 +108,6 @@ cpu_name:
 *      value of the SCTLR_EL1 register.
 */
 ENTRY(__cpu_setup)
-#ifdef CONFIG_SMP
-        /* TODO: only do this for certain CPUs */
-        /*
-         * Enable SMP/nAMP mode.
-         */
-        mrs     x0, actlr_el1
-        tbnz    x0, #6, 1f                      // already enabled?
-        orr     x0, x0, #1 << 6
-        msr     actlr_el1, x0
-1:
-#endif
        /*
         * Preserve the link register across the function call.
         */

diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 720aa0b3bee8..f1d8b9bbfdad 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S
@@ -108,17 +108,6 @@ cpu_name:
108	* value of the SCTLR_EL1 register.	108	* value of the SCTLR_EL1 register.
109	*/	109	*/
110	ENTRY(__cpu_setup)	110	ENTRY(__cpu_setup)
111	#ifdef CONFIG_SMP
112	/* TODO: only do this for certain CPUs */
113	/*
114	* Enable SMP/nAMP mode.
115	*/
116	mrs x0, actlr_el1
117	tbnz x0, #6, 1f // already enabled?
118	orr x0, x0, #1 << 6
119	msr actlr_el1, x0
120	1:
121	#endif
122	/*	111	/*
123	* Preserve the link register across the function call.	112	* Preserve the link register across the function call.
124	*/	113	*/