Two places deserve using the macro is_tsk_32bit_task() added by
commit 252745240ba0 ("powerpc/audit: Fix syscall_get_arch()")

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
 arch/powerpc/kernel/ptrace/ptrace-view.c | 2 +-
 arch/powerpc/perf/perf_regs.c            | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/kernel/ptrace/ptrace-view.c 
b/arch/powerpc/kernel/ptrace/ptrace-view.c
index b8be1d6668b5..f15bc78caf71 100644
--- a/arch/powerpc/kernel/ptrace/ptrace-view.c
+++ b/arch/powerpc/kernel/ptrace/ptrace-view.c
@@ -841,7 +841,7 @@ static const struct user_regset_view user_ppc_compat_view = 
{
 
 const struct user_regset_view *task_user_regset_view(struct task_struct *task)
 {
-       if (IS_ENABLED(CONFIG_PPC64) && test_tsk_thread_flag(task, TIF_32BIT))
+       if (IS_ENABLED(CONFIG_COMPAT) && is_tsk_32bit_task(task))
                return &user_ppc_compat_view;
        return &user_ppc_native_view;
 }
diff --git a/arch/powerpc/perf/perf_regs.c b/arch/powerpc/perf/perf_regs.c
index 51d31b65e423..350dccb0143c 100644
--- a/arch/powerpc/perf/perf_regs.c
+++ b/arch/powerpc/perf/perf_regs.c
@@ -134,12 +134,10 @@ int perf_reg_validate(u64 mask)
 
 u64 perf_reg_abi(struct task_struct *task)
 {
-#ifdef CONFIG_PPC64
-       if (!test_tsk_thread_flag(task, TIF_32BIT))
-               return PERF_SAMPLE_REGS_ABI_64;
+       if (is_tsk_32bit_task(task))
+               return PERF_SAMPLE_REGS_ABI_32;
        else
-#endif
-       return PERF_SAMPLE_REGS_ABI_32;
+               return PERF_SAMPLE_REGS_ABI_64;
 }
 
 void perf_get_regs_user(struct perf_regs *regs_user,
-- 
2.33.1

Reply via email to