---

yaml --- r: 324157 b: refs/heads/master c: 0d0109a h: refs/heads/master i: 324155: 549919d v: v3
git-mirror · Sep 24, 2012 · 2b0ed70 · 2b0ed70
1 parent cffe097
commit 2b0ed70
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git 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
@@ -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.
 	 */