From 0d0109a440ea211e398118752c26d4bad540e604 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mon, 24 Sep 2012 18:06:16 +0100
Subject: [PATCH] arm64: Do not set the SMP/nAMP processor bit

If such bit exists on a given CPU, it must be set by the firmware or
boot-loader prior to starting the kernel (see
Documentation/arm64/booting.txt).

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---
 arch/arm64/mm/proc.S | 11 -----------
 1 file changed, 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.
 	 */
-- 
GitLab