[PATCH] powerpc: Only build restart_table.c for 64s

[PATCH] powerpc: Only build restart_table.c for 64s

[Michael Ellerman]

Commit 9b69d48c7516 ("powerpc/64e: remove implicit soft-masking and
interrupt exit restart logic") limited the implicit soft masking and
restart logic to 64-bit Book3S only. However we are still building
restart_table.c for all 64-bit, ie. Book3E also.

There's no need to build it for 64e, and it also causes missing
prototype warnings for 64e builds, because the prototype is already
behind an #ifdef PPC_BOOK3S_64.

Fixes: 9b69d48c7516 ("powerpc/64e: remove implicit soft-masking and interrupt exit restart logic")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/lib/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 4c92c80454f3..99a7c9132422 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -39,10 +39,10 @@ extra-$(CONFIG_PPC64)	+= crtsavres.o
 endif
 
 obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \
-			       memcpy_power7.o
+			       memcpy_power7.o restart_table.o
 
 obj64-y	+= copypage_64.o copyuser_64.o mem_64.o hweight_64.o \
-	   memcpy_64.o copy_mc_64.o restart_table.o
+	   memcpy_64.o copy_mc_64.o
 
 ifndef CONFIG_PPC_QUEUED_SPINLOCKS
 obj64-$(CONFIG_SMP)	+= locks.o
-- 
2.25.1

Re: [PATCH] powerpc: Only build restart_table.c for 64s

[Michael Ellerman]

On Thu, 1 Jul 2021 22:50:26 +1000, Michael Ellerman wrote:
> Commit 9b69d48c7516 ("powerpc/64e: remove implicit soft-masking and
> interrupt exit restart logic") limited the implicit soft masking and
> restart logic to 64-bit Book3S only. However we are still building
> restart_table.c for all 64-bit, ie. Book3E also.
> 
> There's no need to build it for 64e, and it also causes missing
> prototype warnings for 64e builds, because the prototype is already
> behind an #ifdef PPC_BOOK3S_64.

Applied to powerpc/next.

[1/1] powerpc: Only build restart_table.c for 64s
      https://git.kernel.org/powerpc/c/4ebbbaa4ce8524b853dd6febf0176a6efa3482d7

cheers