2020-04-20 07:49:12

by Christophe Leroy

Subject: [PATCH] powerpc/32s: Fix build failure with CONFIG_PPC_KUAP_DEBUG

gpr2 is not a parametre of kuap_check(), it doesn't exist.

Use gpr instead.

Fixes: a68c31fc01ef ("powerpc/32s: Implement Kernel Userspace Access Protection")
Cc: [email protected]
Signed-off-by: Christophe Leroy <[email protected]>
---
arch/powerpc/include/asm/book3s/32/kup.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/book3s/32/kup.h b/arch/powerpc/include/asm/book3s/32/kup.h
index 3c0ba22dc360..db0a1c281587 100644
--- a/arch/powerpc/include/asm/book3s/32/kup.h
+++ b/arch/powerpc/include/asm/book3s/32/kup.h
@@ -75,7 +75,7 @@

.macro kuap_check current, gpr
#ifdef CONFIG_PPC_KUAP_DEBUG
- lwz \gpr2, KUAP(thread)
+ lwz \gpr, KUAP(thread)
999: twnei \gpr, 0
EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING | BUGFLAG_ONCE)
#endif
--
2.25.0

2020-05-13 12:45:32

by Michael Ellerman

Subject: Re: [PATCH] powerpc/32s: Fix build failure with CONFIG_PPC_KUAP_DEBUG

On Mon, 20 Apr 2020 07:47:05 +0000 (UTC), Christophe Leroy wrote:
> gpr2 is not a parametre of kuap_check(), it doesn't exist.
>
> Use gpr instead.

Applied to powerpc/fixes.

[1/1] powerpc/32s: Fix build failure with CONFIG_PPC_KUAP_DEBUG
https://git.kernel.org/powerpc/c/4833ce06e6855d526234618b746ffb71d6612c9a

cheers