[PATCH] powerpc: Only define _TASK_CPU for 32-bit

[PATCH] powerpc: Only define _TASK_CPU for 32-bit

[Michael Ellerman]

We have some interesting code in our Makefile to define _TASK_CPU, based
on awk'ing the value out of asm-offsets.h. It exists to circumvent some
circular header dependencies that prevent us from referring to
task_struct in the relevant code. See the comment around _TASK_CPU in
smp.h for more detail.

Maybe one day we can come up with a better solution, but for now we can
at least limit that logic to 32-bit, because it's not needed for 64-bit.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 32dd693b4e42..3212d076ac6a 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -438,12 +438,15 @@ endif
 endif
 
 ifdef CONFIG_SMP
+ifdef CONFIG_PPC32
 prepare: task_cpu_prepare
 
 PHONY += task_cpu_prepare
 task_cpu_prepare: prepare0
 	$(eval KBUILD_CFLAGS += -D_TASK_CPU=$(shell awk '{if ($$2 == "TASK_CPU") print $$3;}' include/generated/asm-offsets.h))
-endif
+
+endif # CONFIG_PPC32
+endif # CONFIG_SMP
 
 PHONY += checkbin
 # Check toolchain versions:
-- 
2.25.1

Re: [PATCH] powerpc: Only define _TASK_CPU for 32-bit

[Michael Ellerman]

On Sun, 18 Apr 2021 23:16:41 +1000, Michael Ellerman wrote:
> We have some interesting code in our Makefile to define _TASK_CPU, based
> on awk'ing the value out of asm-offsets.h. It exists to circumvent some
> circular header dependencies that prevent us from referring to
> task_struct in the relevant code. See the comment around _TASK_CPU in
> smp.h for more detail.
> 
> Maybe one day we can come up with a better solution, but for now we can
> at least limit that logic to 32-bit, because it's not needed for 64-bit.

Applied to powerpc/next.

[1/1] powerpc: Only define _TASK_CPU for 32-bit
      https://git.kernel.org/powerpc/c/3027a37c06be364e6443d3df3adf45576fba50cb

cheers