Commit e4371f60 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

s390/compat: remove ptrace compat definitions from uapi header file

The compat definitions are not part of the uapi. So move them to
s390's private compat header file.
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 0f58104c
...@@ -70,6 +70,22 @@ typedef u32 compat_ulong_t; ...@@ -70,6 +70,22 @@ typedef u32 compat_ulong_t;
typedef u64 compat_u64; typedef u64 compat_u64;
typedef u32 compat_uptr_t; typedef u32 compat_uptr_t;
typedef struct {
u32 mask;
u32 addr;
} __aligned(8) psw_compat_t;
typedef struct {
psw_compat_t psw;
u32 gprs[NUM_GPRS];
u32 acrs[NUM_ACRS];
u32 orig_gpr2;
} s390_compat_regs;
typedef struct {
u32 gprs_high[NUM_GPRS];
} s390_compat_regs_high;
struct compat_timespec { struct compat_timespec {
compat_time_t tv_sec; compat_time_t tv_sec;
s32 tv_nsec; s32 tv_nsec;
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
*/ */
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/compat.h>
#include <asm/user.h> #include <asm/user.h>
typedef s390_fp_regs elf_fpregset_t; typedef s390_fp_regs elf_fpregset_t;
......
...@@ -215,12 +215,6 @@ typedef struct ...@@ -215,12 +215,6 @@ typedef struct
unsigned long addr; unsigned long addr;
} __attribute__ ((aligned(8))) psw_t; } __attribute__ ((aligned(8))) psw_t;
typedef struct
{
__u32 mask;
__u32 addr;
} __attribute__ ((aligned(8))) psw_compat_t;
#ifndef __s390x__ #ifndef __s390x__
#define PSW_MASK_PER 0x40000000UL #define PSW_MASK_PER 0x40000000UL
...@@ -295,20 +289,6 @@ typedef struct ...@@ -295,20 +289,6 @@ typedef struct
unsigned long orig_gpr2; unsigned long orig_gpr2;
} s390_regs; } s390_regs;
typedef struct
{
psw_compat_t psw;
__u32 gprs[NUM_GPRS];
__u32 acrs[NUM_ACRS];
__u32 orig_gpr2;
} s390_compat_regs;
typedef struct
{
__u32 gprs_high[NUM_GPRS];
} s390_compat_regs_high;
/* /*
* Now for the user space program event recording (trace) definitions. * Now for the user space program event recording (trace) definitions.
* The following structures are used only for the ptrace interface, don't * The following structures are used only for the ptrace interface, don't
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment