From 8c633c78c23a85a9efbabbe47d815ebdd7739905 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 10 Nov 2025 19:54:33 +0100 Subject: [PATCH] s390/ptrace: Rename psw_t32 to psw32_t Use a standard "_t" suffix for psw_t32 and rename it to psw32_t. Reviewed-by: Arnd Bergmann Signed-off-by: Heiko Carstens --- arch/s390/boot/ipl_data.c | 2 +- arch/s390/include/asm/ptrace.h | 2 +- arch/s390/kernel/compat_linux.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/s390/boot/ipl_data.c b/arch/s390/boot/ipl_data.c index c4130a80b058e..7957cc6554e77 100644 --- a/arch/s390/boot/ipl_data.c +++ b/arch/s390/boot/ipl_data.c @@ -12,7 +12,7 @@ #define PSW_MASK_DISABLED (PSW_MASK_WAIT | PSW_MASK_EA | PSW_MASK_BA) struct ipl_lowcore { - psw_t32 ipl_psw; /* 0x0000 */ + psw32_t ipl_psw; /* 0x0000 */ struct ccw0 ccwpgm[2]; /* 0x0008 */ u8 fill[56]; /* 0x0018 */ struct ccw0 ccwpgmcc[20]; /* 0x0050 */ diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h index dd87466ba0ea0..962cf042c66dd 100644 --- a/arch/s390/include/asm/ptrace.h +++ b/arch/s390/include/asm/ptrace.h @@ -102,7 +102,7 @@ enum { typedef struct { unsigned int mask; unsigned int addr; -} psw_t32 __aligned(8); +} psw32_t __aligned(8); #define PGM_INT_CODE_MASK 0x7f #define PGM_INT_CODE_PER 0x80 diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h index ef23739b277c7..133f22b5deebc 100644 --- a/arch/s390/kernel/compat_linux.h +++ b/arch/s390/kernel/compat_linux.h @@ -33,7 +33,7 @@ typedef struct { } _s390_fp_regs32; typedef struct { - psw_t32 psw; + psw32_t psw; __u32 gprs[__NUM_GPRS]; __u32 acrs[__NUM_ACRS]; } _s390_regs_common32; -- 2.47.3