Skip to content

Commit b9ee5e0

Browse files
chleroympe
authored andcommitted
powerpc/64e: Drop stale call to smp_processor_id() which hangs SMP startup
Commit ebb9d30 ("powerpc/mm: any thread in one core can be the first to setup TLB1") removed the need to know the cpu_id in early_init_this_mmu(), but the call to smp_processor_id() which was marked __maybe_used remained. Since commit ed1cd6d ("powerpc: Activate CONFIG_THREAD_INFO_IN_TASK") thread_info cannot be reached before MMU is properly set up. Drop this stale call to smp_processor_id() which makes SMP hang when CONFIG_PREEMPT is set. Fixes: ebb9d30 ("powerpc/mm: any thread in one core can be the first to setup TLB1") Fixes: ed1cd6d ("powerpc: Activate CONFIG_THREAD_INFO_IN_TASK") Cc: [email protected] # v5.1+ Reported-by: Chris Packham <[email protected]> Signed-off-by: Christophe Leroy <[email protected]> Tested-by: Chris Packham <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/bef479514f4c08329fa649f67735df8918bc0976.1565268248.git.christophe.leroy@c-s.fr
1 parent ed4289e commit b9ee5e0

File tree

1 file changed

+0
-1
lines changed
  • arch/powerpc/mm/nohash

1 file changed

+0
-1
lines changed

arch/powerpc/mm/nohash/tlb.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,6 @@ static void early_init_this_mmu(void)
630630
#ifdef CONFIG_PPC_FSL_BOOK3E
631631
if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) {
632632
unsigned int num_cams;
633-
int __maybe_unused cpu = smp_processor_id();
634633
bool map = true;
635634

636635
/* use a quarter of the TLBCAM for bolted linear map */

0 commit comments

Comments
 (0)