Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Christophe Leroy <christophe.leroy@csgroup.eu>
To:     Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Paul Mackerras <paulus@samba.org>,
        Michael Ellerman <mpe@ellerman.id.au>
CC:     Christophe Leroy <christophe.leroy@csgroup.eu>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: [PATCH] powerpc: Use the newly added is_tsk_32bit_task() macro
Thread-Topic: [PATCH] powerpc: Use the newly added is_tsk_32bit_task() macro
Thread-Index: AQHYDpy4hPHu76LjxU2w94A4PS0MOw==
Date:   Fri, 21 Jan 2022 07:58:47 +0000
Message-ID: <7304a889dbe885aefad8a8333673c81ee4b8f7a6.1642751874.git.christophe.leroy@csgroup.eu>
Accept-Language: fr-FR, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?BkvDXSIpYYWpJvyXZVU6XZ/oFjBE1EdlN9G0Cfq2pJliq8TQLX8MnsMNdW?=
 =?iso-8859-1?Q?kDOHOS4fbFb4vCoPurLOxjbqQ0AUWISOKKFwKA5yZ80hid/CypKSTQrADs?=
 =?iso-8859-1?Q?J1N8eWgI1WF3q2BHHJdYHnsBQAZZG5kV+ZvXblvZeco94EDzXEjK5qmMOo?=
 =?iso-8859-1?Q?IsVR3aYnUcLXDICwMLWNB5bXaKfekp/yRTr+1ymJgU13T8LpVO2GYN50v6?=
 =?iso-8859-1?Q?L7aJjlNa1Qu0O/wKgY3NRVeNvNTm2f3nNNENADjs1CefXoLLwJCEtGdoEo?=
 =?iso-8859-1?Q?2RIM3M/NIfbe709wzfKSnaz0Ki77ad+SstWbV8wCcuR4IAB73o2veFLvqt?=
 =?iso-8859-1?Q?yk4HtwHxVibF7GqOwbglFV46UbBt4WAJCDaQRh4zAbd6+f5C+XfHqALiwQ?=
 =?iso-8859-1?Q?H/NjzujOuz14JYS3Ck4l6aZHTqOXarok/fYD9ZL5QUccgjxDxgNO8iyyiK?=
 =?iso-8859-1?Q?AJNcTe4zeXtXt8Fkaa4FI0uA3KZ+3OTCVaQECmcm4nR0lFmsw9PEKLk8qL?=
 =?iso-8859-1?Q?drUzQ7KTRWSSdaSnK7HljPOklCExaFAQsep2M3nAEQ4Po4vg4qiMf6XMFB?=
 =?iso-8859-1?Q?wifuBj5MTz2O/JD4+UapQqVJ4EchmqCf0itSNFIvYFfcCV24fcIucc2ect?=
 =?iso-8859-1?Q?H9crGAtEq/KHMiICd7hLQvCxIvyXn8Q0aViU1M856xV5laVp4IdiNflzZ0?=
 =?iso-8859-1?Q?ePyVpoqEglU06tCHhoOeL5m7ai10dIzaYKzTTlhIgpnj8mvwCy6ZCCrRID?=
 =?iso-8859-1?Q?whPJxL5KeoVhWRUY9/2k5DSNGKENpVwVw7uFOZ9opjsspROunt2R02UO09?=
 =?iso-8859-1?Q?Xx1yIJCxOS6HfKWS4j//bO6xMJ0fUERJChjjr9PGjXlyN0fRPCBTGpwBM9?=
 =?iso-8859-1?Q?hDWKkJ9631GGudDK1846DtiqUONgsWq8RsZinn6zW6s5rVMpFAaWtq2adA?=
 =?iso-8859-1?Q?bQHERxAXRVWykiNy7dnPGkb1Xx2ek7LDQpvSBYUPn2xKa7B3u4AjcYXdse?=
 =?iso-8859-1?Q?XqaOYp9cydTq6Aiv7y3L1wVlaViTKrjEiFj9LTEzuSKxU6i3DS/S4bROG0?=
 =?iso-8859-1?Q?Iuz0M1/o5t9qHl53iWSXU/FdG+10ihYB+yOz7NRz1uj0GJxAmqqhEWEheu?=
 =?iso-8859-1?Q?Lq1ZVlNxtlVTvBSY3c1lG+MEDFmde/NOVsxTGy76wKFQODasdNQQZmiAUB?=
 =?iso-8859-1?Q?0AF57EoYQ/6Sv3sxkArAfYvo3qDDPgNls2QaArBxPvaTIV/x35TY+JAt+4?=
 =?iso-8859-1?Q?YGdUlFSnpwUCKBiLTJA7lzF/8ggHifCYbD4+rzShfhpL2PbzPbOX3kB9g/?=
 =?iso-8859-1?Q?l1oXyUoWAmSyLWu7SAq5zEbblqp8o/QPyvPf+TImENAiWBizDuHPJEoykA?=
 =?iso-8859-1?Q?eEShoFRpRUj04xmoIA0F4DB2YiQMTL+plfeYlb4W58vacqr2FkcN7c+hM9?=
 =?iso-8859-1?Q?AZbf8W9caqZ5SYlv8SesE5yhvgRD6ME9b/WBlHARvxlwIAfJ2I4HChJJAN?=
 =?iso-8859-1?Q?zGam7smZOn0iN+EtixCI5UmlPbHIJb73JXJ/MeuUWTSQVXeCFmBBk/+fyM?=
 =?iso-8859-1?Q?6+PjSRDYcxqfBdlt7KoI/1XuMJr34SMY+PFEFpOhUz3LLlnJzv6fyGM52h?=
 =?iso-8859-1?Q?e4LbqLQ/i5JYPa0dHey/J0Ovi+k6Pw5iyKrq/xSG60TaGfqcs8hfJxDqT3?=
 =?iso-8859-1?Q?ML2guVjzVUbaesKsNFo6tKxs/SxuP4oIXin+f9N0nEKTeyYNLiiHoyhhsa?=
 =?iso-8859-1?Q?MgLqk2J+Uit4XXeYMie1ut5l8=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-OriginatorOrg: csgroup.eu
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-Network-Message-Id: 76a60b77-4117-424a-f343-08d9dcb3da94
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2022 07:58:47.3149
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: Lzd7VmRlgVS8Hf1cB7Zpyc5IiSAVNcDd4N9RFBl3Lg62c1bmVYzQ/qvAs8M0WZV5ExNIJne5ltDEVz/MvlUdfrBC4P6hn4GYKcjMy13RfQo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAYP264MB4205
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.leroy@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