]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
arm64: Do not set the SMP/nAMP processor bit
authorCatalin Marinas <catalin.marinas@arm.com>
Mon, 24 Sep 2012 17:06:16 +0000 (18:06 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Mon, 24 Sep 2012 17:10:29 +0000 (18:10 +0100)
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

index 720aa0b3bee88a4968adf41da8e73ee9c5c7df88..f1d8b9bbfdadc5a64a63d781051e6675aa39e322 100644 (file)
@@ -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.
         */