| From ea696ea7a8c48f4b3bea56b790dcf65f5ed5552e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 22 Mar 2019 04:24:37 +0000 |
| Subject: powerpc: vdso: Make vdso32 installation conditional in vdso_install |
| |
| From: Ben Hutchings <ben@decadent.org.uk> |
| |
| [ Upstream commit ff6d27823f619892ab96f7461764840e0d786b15 ] |
| |
| The 32-bit vDSO is not needed and not normally built for 64-bit |
| little-endian configurations. However, the vdso_install target still |
| builds and installs it. Add the same config condition as is normally |
| used for the build. |
| |
| Fixes: e0d005916994 ("powerpc/vdso: Disable building the 32-bit VDSO ...") |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/Makefile | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile |
| index a60c9c6e5cc17..de29b88c0e700 100644 |
| --- a/arch/powerpc/Makefile |
| +++ b/arch/powerpc/Makefile |
| @@ -373,7 +373,9 @@ vdso_install: |
| ifeq ($(CONFIG_PPC64),y) |
| $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@ |
| endif |
| +ifdef CONFIG_VDSO32 |
| $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@ |
| +endif |
| |
| archclean: |
| $(Q)$(MAKE) $(clean)=$(boot) |
| -- |
| 2.20.1 |
| |