aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2012-09-24 13:06:16 -0400
committerCatalin Marinas <catalin.marinas@arm.com>2012-09-24 13:10:29 -0400
commit0d0109a440ea211e398118752c26d4bad540e604 (patch)
tree3d5dfec668248d94b232474d2d3f4dba8615fa21 /arch/arm64
parent38074229de4774597ea09315ae78a550cada5ba6 (diff)
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>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/mm/proc.S11
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:
108 * value of the SCTLR_EL1 register. 108 * value of the SCTLR_EL1 register.
109 */ 109 */
110ENTRY(__cpu_setup) 110ENTRY(__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
1201:
121#endif
122 /* 111 /*
123 * Preserve the link register across the function call. 112 * Preserve the link register across the function call.
124 */ 113 */