From 2b0ed70db82656248cc12a281ac54e76eaf59096 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] --- yaml --- r: 324157 b: refs/heads/master c:
 0d0109a440ea211e398118752c26d4bad540e604 h: refs/heads/master i:   324155:
 549919dde14374c0f9af029f5a0eebcad3becab1 v: v3

---
 [refs]                     |  2 +-
 trunk/arch/arm64/mm/proc.S | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 5db558863be9..0d5ca063bfa9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38074229de4774597ea09315ae78a550cada5ba6
+refs/heads/master: 0d0109a440ea211e398118752c26d4bad540e604
diff --git a/trunk/arch/arm64/mm/proc.S b/trunk/arch/arm64/mm/proc.S
index 720aa0b3bee8..f1d8b9bbfdad 100644
--- a/trunk/arch/arm64/mm/proc.S
+++ b/trunk/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.
 	 */