diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-24 18:06:16 +0100 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-24 18:10:29 +0100 |
commit | 0d0109a440ea211e398118752c26d4bad540e604 (patch) | |
tree | 3d5dfec668248d94b232474d2d3f4dba8615fa21 | |
parent | 38074229de4774597ea09315ae78a550cada5ba6 (diff) | |
download | linux-stable-0d0109a440ea211e398118752c26d4bad540e604.tar.gz linux-stable-0d0109a440ea211e398118752c26d4bad540e604.tar.bz2 linux-stable-0d0109a440ea211e398118752c26d4bad540e604.zip |
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>
-rw-r--r-- | arch/arm64/mm/proc.S | 11 |
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. */ |