ARM: 9354/1: ptrace: Use bitfield helpers

commit b36e78b216e632d90138751e4ff80044de303656 upstream.

The isa_mode() macro extracts two fields, and recombines them into a
single value.

Make this more obvious by using the FIELD_GET() helper, and shifting the
result into its final resting place.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Geert Uytterhoeven
2024-02-26 12:25:01 +01:00
committed by Greg Kroah-Hartman
parent f9917821c5
commit 18d3f9b8e4

View File

@@ -10,6 +10,7 @@
#include <uapi/asm/ptrace.h> #include <uapi/asm/ptrace.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/bitfield.h>
#include <linux/types.h> #include <linux/types.h>
struct pt_regs { struct pt_regs {
@@ -35,8 +36,8 @@ struct svc_pt_regs {
#ifndef CONFIG_CPU_V7M #ifndef CONFIG_CPU_V7M
#define isa_mode(regs) \ #define isa_mode(regs) \
((((regs)->ARM_cpsr & PSR_J_BIT) >> (__ffs(PSR_J_BIT) - 1)) | \ (FIELD_GET(PSR_J_BIT, (regs)->ARM_cpsr) << 1 | \
(((regs)->ARM_cpsr & PSR_T_BIT) >> (__ffs(PSR_T_BIT)))) FIELD_GET(PSR_T_BIT, (regs)->ARM_cpsr))
#else #else
#define isa_mode(regs) 1 /* Thumb */ #define isa_mode(regs) 1 /* Thumb */
#endif #endif