summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel
diff options
context:
space:
mode:
authorHeiko Carstens <hca@linux.ibm.com>2022-04-27 04:14:29 +0200
committerHeiko Carstens <hca@linux.ibm.com>2022-05-06 20:45:15 +0200
commit67a9c428ef35780d09e5a3c1247919789a8212b4 (patch)
treedc9b9518f368488d373343c83d1d916c26e19dda /arch/s390/kernel
parentaceb06d1e83783bf5a25c4979647bd8af6a99654 (diff)
downloadlinux-67a9c428ef35780d09e5a3c1247919789a8212b4.tar.gz
linux-67a9c428ef35780d09e5a3c1247919789a8212b4.tar.bz2
linux-67a9c428ef35780d09e5a3c1247919789a8212b4.zip
s390/ptrace: move short psw definitions to ptrace header file
The short psw definitions are contained in compat header files, however short psws are not compat specific. Therefore move the definitions to ptrace header file. This also gets rid of a compat header include in kvm code. Acked-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r--arch/s390/kernel/compat_linux.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h
index 64509e7dbd3b..f46ca315631d 100644
--- a/arch/s390/kernel/compat_linux.h
+++ b/arch/s390/kernel/compat_linux.h
@@ -5,6 +5,7 @@
#include <linux/compat.h>
#include <linux/socket.h>
#include <linux/syscalls.h>
+#include <asm/ptrace.h>
/* Macro that masks the high order bit of an 32 bit pointer and converts it*/
/* to a 64 bit pointer */
@@ -32,15 +33,9 @@ typedef struct
freg_t32 fprs[__NUM_FPRS];
} _s390_fp_regs32;
-typedef struct
-{
- __u32 mask;
- __u32 addr;
-} _psw_t32 __attribute__ ((aligned(8)));
-
typedef struct
{
- _psw_t32 psw;
+ psw_t32 psw;
__u32 gprs[__NUM_GPRS];
__u32 acrs[__NUM_ACRS];
} _s390_regs_common32;