arm64: make member of struct pt_regs and it's offset macro in the same order

[PATCH] arm64: make member of struct pt_regs and it's offset macro in the same order

Posted by Kemeng Shi 1 year, 10 months ago

In struct pt_regs, member pstate is after member pc. Move offset macro
of pstate after offset macro of pc to improve readability a little.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
 arch/arm64/kernel/asm-offsets.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index 5ff1942b04fc..865ba901c233 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -75,8 +75,8 @@ int main(void)
   DEFINE(S_FP,			offsetof(struct pt_regs, regs[29]));
   DEFINE(S_LR,			offsetof(struct pt_regs, regs[30]));
   DEFINE(S_SP,			offsetof(struct pt_regs, sp));
-  DEFINE(S_PSTATE,		offsetof(struct pt_regs, pstate));
   DEFINE(S_PC,			offsetof(struct pt_regs, pc));
+  DEFINE(S_PSTATE,		offsetof(struct pt_regs, pstate));
   DEFINE(S_SYSCALLNO,		offsetof(struct pt_regs, syscallno));
   DEFINE(S_SDEI_TTBR1,		offsetof(struct pt_regs, sdei_ttbr1));
   DEFINE(S_PMR_SAVE,		offsetof(struct pt_regs, pmr_save));
-- 
2.30.0

Re: [PATCH] arm64: make member of struct pt_regs and it's offset macro in the same order

Posted by Catalin Marinas 1 year, 10 months ago

On Wed, 31 Jan 2024 01:55:04 +0800, Kemeng Shi wrote:
> In struct pt_regs, member pstate is after member pc. Move offset macro
> of pstate after offset macro of pc to improve readability a little.
> 
> 

Applied to arm64 (for-next/misc), thanks!

[1/1] arm64: make member of struct pt_regs and it's offset macro in the same order
      https://git.kernel.org/arm64/c/58a0484eaf5e

-- 
Catalin

Re: [PATCH] arm64: make member of struct pt_regs and it's offset macro in the same order

Posted by Mark Rutland 1 year, 10 months ago

On Wed, Jan 31, 2024 at 01:55:04AM +0800, Kemeng Shi wrote:
> In struct pt_regs, member pstate is after member pc. Move offset macro
> of pstate after offset macro of pc to improve readability a little.
> 
> Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>

I think this makes sense as a trivial cleanup, so FWIW:

Acked-by: Mark Rutland <mark.rutland@arm.com>

Mark.

> ---
>  arch/arm64/kernel/asm-offsets.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
> index 5ff1942b04fc..865ba901c233 100644
> --- a/arch/arm64/kernel/asm-offsets.c
> +++ b/arch/arm64/kernel/asm-offsets.c
> @@ -75,8 +75,8 @@ int main(void)
>    DEFINE(S_FP,			offsetof(struct pt_regs, regs[29]));
>    DEFINE(S_LR,			offsetof(struct pt_regs, regs[30]));
>    DEFINE(S_SP,			offsetof(struct pt_regs, sp));
> -  DEFINE(S_PSTATE,		offsetof(struct pt_regs, pstate));
>    DEFINE(S_PC,			offsetof(struct pt_regs, pc));
> +  DEFINE(S_PSTATE,		offsetof(struct pt_regs, pstate));
>    DEFINE(S_SYSCALLNO,		offsetof(struct pt_regs, syscallno));
>    DEFINE(S_SDEI_TTBR1,		offsetof(struct pt_regs, sdei_ttbr1));
>    DEFINE(S_PMR_SAVE,		offsetof(struct pt_regs, pmr_save));
> -- 
> 2.30.0
>