Re: [PATCH] powerpc/uaccess: correct check for CONFIG_PPC_E500 in mask_user_address()

[Christophe Leroy (CS GROUP)]

Le 11/06/2026 à 03:09, Ethan Nelson-Moore a écrit :

CONFIG_E500 was renamed to CONFIG_PPC_E500 in commit 688de017efaa
("powerpc: Change CONFIG_E500 to CONFIG_PPC_E500"), but the check for
it in mask_user_address() was not updated, causing
mask_user_address_isel() to no longer be used on E500 hardware. Fix the
check to use the correct name.

Fixes: 688de017efaa ("powerpc: Change CONFIG_E500 to CONFIG_PPC_E500")

Correct Fixes tag is:

Fixes: 861574d51bbd ("powerpc/uaccess: Implement masked user access")

Cc: sta...@vger.kernel.org # 6.1+
Signed-off-by: Ethan Nelson-Moore <enelsonmo...@gmail.com>

Reviewed-by: Christophe Leroy (CS GROUP) <chle...@kernel.org>

---
  arch/powerpc/include/asm/uaccess.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/uaccess.h 
b/arch/powerpc/include/asm/uaccess.h
index e98c628e3899..619270bb7380 100644
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@@ -511,7 +511,7 @@ static inline void __user *mask_user_address(const void 
__user *ptr)

if (IS_ENABLED(CONFIG_PPC64))

                return mask_user_address_simple(ptr);
-       if (IS_ENABLED(CONFIG_E500))
+       if (IS_ENABLED(CONFIG_PPC_E500))
                return mask_user_address_isel(ptr);
        if (TASK_SIZE <= UL(SZ_2G) && border >= UL(SZ_2G))
                return mask_user_address_simple(ptr);