powerpc/vdso32: Fix use of crtsavres for PPC64

[PATCH] powerpc/vdso32: Fix use of crtsavres for PPC64

Posted by Christophe Leroy 1 year, 4 months ago

crtsavres.S content is encloded by a #ifndef CONFIG_PPC64

To be used on VDSO32 on PPC64 it's content must available on PPC64 as
well.

Replace #ifndef CONFIG_PPC64 by #ifndef __powerpc64__ as __powerpc64__
is not set when building VDSO32 on PPC64.

Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Closed: https://lore.kernel.org/linuxppc-dev/047b7503-af0c-4bb0-b12a-2f6b1e461752@csgroup.eu/T/
Fixes: b163596a5b6f ("powerpc/vdso32: Add crtsavres")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 arch/powerpc/lib/crtsavres.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/lib/crtsavres.S b/arch/powerpc/lib/crtsavres.S
index 7e5e1c28e56a..8967903c15e9 100644
--- a/arch/powerpc/lib/crtsavres.S
+++ b/arch/powerpc/lib/crtsavres.S
@@ -46,7 +46,7 @@
 
 	.section ".text"
 
-#ifndef CONFIG_PPC64
+#ifndef __powerpc64__
 
 /* Routines for saving integer registers, called by the compiler.  */
 /* Called with r11 pointing to the stack header word of the caller of the */
-- 
2.44.0

Re: [PATCH] powerpc/vdso32: Fix use of crtsavres for PPC64

Posted by Christian Zigotzky 1 year, 4 months ago

On 19. Sep 2024, at 20:56, Christophe Leroy <christophe.leroy@csgroup.eu> wrote:

crtsavres.S content is encloded by a #ifndef CONFIG_PPC64

To be used on VDSO32 on PPC64 it's content must available on PPC64 as
well.

Replace #ifndef CONFIG_PPC64 by #ifndef __powerpc64__ as __powerpc64__
is not set when building VDSO32 on PPC64.

Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Closed: https://lore.kernel.org/linuxppc-dev/047b7503-af0c-4bb0-b12a-2f6b1e461752@csgroup.eu/T/
Fixes: b163596a5b6f ("powerpc/vdso32: Add crtsavres")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/lib/crtsavres.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/lib/crtsavres.S b/arch/powerpc/lib/crtsavres.S
index 7e5e1c28e56a..8967903c15e9 100644
--- a/arch/powerpc/lib/crtsavres.S
+++ b/arch/powerpc/lib/crtsavres.S
@@ -46,7 +46,7 @@

   .section ".text"

-#ifndef CONFIG_PPC64
+#ifndef __powerpc64__

/* Routines for saving integer registers, called by the compiler.  */
/* Called with r11 pointing to the stack header word of the caller of the */
--
2.44.0


It works! Thank you.

Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de>

Re: [PATCH] powerpc/vdso32: Fix use of crtsavres for PPC64

Posted by Michael Ellerman 1 year, 4 months ago

On Thu, 19 Sep 2024 20:55:57 +0200, Christophe Leroy wrote:
> crtsavres.S content is encloded by a #ifndef CONFIG_PPC64
> 
> To be used on VDSO32 on PPC64 it's content must available on PPC64 as
> well.
> 
> Replace #ifndef CONFIG_PPC64 by #ifndef __powerpc64__ as __powerpc64__
> is not set when building VDSO32 on PPC64.
> 
> [...]

Applied to powerpc/fixes.

[1/1] powerpc/vdso32: Fix use of crtsavres for PPC64
      https://git.kernel.org/powerpc/c/699d53f04829d6b8855ff458f86e4b75ef3e5f0c

cheers