From: Ard Biesheuvel <ardb@kernel.org>
Date: Tue, 14 Sep 2021 12:10:32 +0000 (+0200)
Subject: powerpc: add CPU field to struct thread_info
X-Git-Tag: v5.16-rc1~180^2^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=227d735d889e0403f1659df6e2dece7633f380bc;p=thirdparty%2Fkernel%2Flinux.git

powerpc: add CPU field to struct thread_info

The CPU field will be moved back into thread_info even when
THREAD_INFO_IN_TASK is enabled, so add it back to powerpc's definition
of struct thread_info.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
---

diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index b4ec6c7dd72ee..5725029aaa295 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -47,6 +47,9 @@
 struct thread_info {
 	int		preempt_count;		/* 0 => preemptable,
 						   <0 => BUG */
+#ifdef CONFIG_SMP
+	unsigned int	cpu;
+#endif
 	unsigned long	local_flags;		/* private flags for thread */
 #ifdef CONFIG_LIVEPATCH
 	unsigned long *livepatch_sp;