From: Ard Biesheuvel <ardb@kernel.org>
Date: Mon, 24 Jan 2022 22:29:59 +0000 (+0100)
Subject: ARM: drop pointless SMP check on secondary startup path
X-Git-Tag: v5.18-rc1~150^2~8^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57a420435edcb0b947a74171bf49ada7a5892d4f;p=thirdparty%2Fkernel%2Flinux.git

ARM: drop pointless SMP check on secondary startup path

Only SMP systems use the secondary startup path by definition, so there
is no need for SMP conditionals there.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 951559e5bea33..e34efa96cea10 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -405,11 +405,6 @@ static void smp_store_cpu_info(unsigned int cpuid)
 
 static void set_current(struct task_struct *cur)
 {
-	if (!IS_ENABLED(CONFIG_CURRENT_POINTER_IN_TPIDRURO) && !is_smp()) {
-		__current = cur;
-		return;
-	}
-
 	/* Set TPIDRURO */
 	asm("mcr p15, 0, %0, c13, c0, 3" :: "r"(cur) : "memory");
 }