korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 00:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Heiko Carstens 2013-04-20 14:05:42 +02:00 committed by Martin Schwidefsky
parent 0f58104c8c
commit e4371f602e
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/s390/include/asm/compat.h
View File

@ -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;

1
arch/s390/include/asm/elf.h
View File

@ -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;

20
arch/s390/include/uapi/asm/ptrace.h
View File

@ -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
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