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: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
index 1f1a4490cdeb371e69df6929bffa3bbc6aa9948b..da3df9f6eded98e50eefe9d61b0cb336658c127d 100644 (file)
--- a/arch/s390/include/asm/compat.h
+++ b/arch/s390/include/asm/compat.h
@@ -70,6 +70,22 @@ typedef u32          compat_ulong_t;
 typedef u64            compat_u64;
 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 {
        compat_time_t   tv_sec;
        s32             tv_nsec;

diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index 1bfdf24b85a20bfdab742d9d0c2f04cfb03d9adb..27ec2c3f95acb3dd8219a7ef1e80dc7388a375d8 100644 (file)
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -119,6 +119,7 @@
  */
 
 #include <asm/ptrace.h>
+#include <asm/compat.h>
 #include <asm/user.h>
 
 typedef s390_fp_regs elf_fpregset_t;

diff --git a/arch/s390/include/uapi/asm/ptrace.h b/arch/s390/include/uapi/asm/ptrace.h
index a5ca214b34fdb1271e4fad48d9c7c7fb8c5a9437..3aa9f1ec5b295f0c530998610d04fa7de34dc93f 100644 (file)
--- a/arch/s390/include/uapi/asm/ptrace.h
+++ b/arch/s390/include/uapi/asm/ptrace.h
@@ -215,12 +215,6 @@ typedef struct
         unsigned long addr;
 } __attribute__ ((aligned(8))) psw_t;
 
-typedef struct
-{
-       __u32   mask;
-       __u32   addr;
-} __attribute__ ((aligned(8))) psw_compat_t;
-
 #ifndef __s390x__
 
 #define PSW_MASK_PER           0x40000000UL
@@ -295,20 +289,6 @@ typedef struct
        unsigned long orig_gpr2;
 } 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.
  * The following structures are used only for the ptrace interface, don't