Commit 3db5cf93 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/uapi: Remove 31 bit support from uapi header files 



Since the kernel does not support running 31 bit / compat binaries
anymore, remove also the corresponding 31 bit support from uapi header
files.

Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 8e0b986c

arch/s390/include/uapi/asm/bitsperlong.h

+0 −4
Original line number Diff line number Diff line
@@ -2,11 +2,7 @@ 
#ifndef __ASM_S390_BITSPERLONG_H

#define __ASM_S390_BITSPERLONG_H



#ifndef __s390x__

#define __BITS_PER_LONG 32

#else

#define __BITS_PER_LONG 64

#endif



#include <asm-generic/bitsperlong.h>

arch/s390/include/uapi/asm/ipcbuf.h

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ struct ipc64_perm 
	__kernel_mode_t		mode;

	unsigned short		__pad1;

	unsigned short		seq;

#ifndef __s390x__

	unsigned short		__pad2;

#endif /* ! __s390x__ */

	unsigned long		__unused1;

	unsigned long		__unused2;

};

arch/s390/include/uapi/asm/posix_types.h

+0 −13
Original line number Diff line number Diff line
@@ -26,17 +26,6 @@ typedef unsigned short __kernel_old_gid_t; 
#define __kernel_old_uid_t __kernel_old_uid_t

#endif



#ifndef __s390x__



typedef unsigned long   __kernel_ino_t;

typedef unsigned short  __kernel_mode_t;

typedef unsigned short  __kernel_ipc_pid_t;

typedef unsigned short  __kernel_uid_t;

typedef unsigned short  __kernel_gid_t;

typedef int             __kernel_ptrdiff_t;



#else /* __s390x__ */



typedef unsigned int    __kernel_ino_t;

typedef unsigned int    __kernel_mode_t;

typedef int             __kernel_ipc_pid_t;
@@ -45,8 +34,6 @@ typedef unsigned int __kernel_gid_t; 
typedef long            __kernel_ptrdiff_t;

typedef unsigned long   __kernel_sigset_t;      /* at least 32 bits */



#endif /* __s390x__ */



#define __kernel_ino_t  __kernel_ino_t

#define __kernel_mode_t __kernel_mode_t

#define __kernel_ipc_pid_t __kernel_ipc_pid_t

arch/s390/include/uapi/asm/ptrace.h

+0 −124
Original line number Diff line number Diff line
@@ -14,94 +14,6 @@ 
 * Offsets in the user_regs_struct. They are used for the ptrace

 * system call and in entry.S

 */

#ifndef __s390x__



#define PT_PSWMASK  0x00

#define PT_PSWADDR  0x04

#define PT_GPR0     0x08

#define PT_GPR1     0x0C

#define PT_GPR2     0x10

#define PT_GPR3     0x14

#define PT_GPR4     0x18

#define PT_GPR5     0x1C

#define PT_GPR6     0x20

#define PT_GPR7     0x24

#define PT_GPR8     0x28

#define PT_GPR9     0x2C

#define PT_GPR10    0x30

#define PT_GPR11    0x34

#define PT_GPR12    0x38

#define PT_GPR13    0x3C

#define PT_GPR14    0x40

#define PT_GPR15    0x44

#define PT_ACR0     0x48

#define PT_ACR1     0x4C

#define PT_ACR2     0x50

#define PT_ACR3     0x54

#define PT_ACR4	    0x58

#define PT_ACR5	    0x5C

#define PT_ACR6	    0x60

#define PT_ACR7	    0x64

#define PT_ACR8	    0x68

#define PT_ACR9	    0x6C

#define PT_ACR10    0x70

#define PT_ACR11    0x74

#define PT_ACR12    0x78

#define PT_ACR13    0x7C

#define PT_ACR14    0x80

#define PT_ACR15    0x84

#define PT_ORIGGPR2 0x88

#define PT_FPC	    0x90

/*

 * A nasty fact of life that the ptrace api

 * only supports passing of longs.

 */

#define PT_FPR0_HI  0x98

#define PT_FPR0_LO  0x9C

#define PT_FPR1_HI  0xA0

#define PT_FPR1_LO  0xA4

#define PT_FPR2_HI  0xA8

#define PT_FPR2_LO  0xAC

#define PT_FPR3_HI  0xB0

#define PT_FPR3_LO  0xB4

#define PT_FPR4_HI  0xB8

#define PT_FPR4_LO  0xBC

#define PT_FPR5_HI  0xC0

#define PT_FPR5_LO  0xC4

#define PT_FPR6_HI  0xC8

#define PT_FPR6_LO  0xCC

#define PT_FPR7_HI  0xD0

#define PT_FPR7_LO  0xD4

#define PT_FPR8_HI  0xD8

#define PT_FPR8_LO  0XDC

#define PT_FPR9_HI  0xE0

#define PT_FPR9_LO  0xE4

#define PT_FPR10_HI 0xE8

#define PT_FPR10_LO 0xEC

#define PT_FPR11_HI 0xF0

#define PT_FPR11_LO 0xF4

#define PT_FPR12_HI 0xF8

#define PT_FPR12_LO 0xFC

#define PT_FPR13_HI 0x100

#define PT_FPR13_LO 0x104

#define PT_FPR14_HI 0x108

#define PT_FPR14_LO 0x10C

#define PT_FPR15_HI 0x110

#define PT_FPR15_LO 0x114

#define PT_CR_9	    0x118

#define PT_CR_10    0x11C

#define PT_CR_11    0x120

#define PT_IEEE_IP  0x13C

#define PT_LASTOFF  PT_IEEE_IP

#define PT_ENDREGS  0x140-1



#define GPR_SIZE	4

#define CR_SIZE		4



#define STACK_FRAME_OVERHEAD	96	/* size of minimum stack frame */



#else /* __s390x__ */



#define PT_PSWMASK  0x00

#define PT_PSWADDR  0x08

#define PT_GPR0     0x10
@@ -166,38 +78,6 @@ 


#define STACK_FRAME_OVERHEAD	160	 /* size of minimum stack frame */



#endif /* __s390x__ */



#ifndef __s390x__



#define PSW_MASK_PER		_AC(0x40000000, UL)

#define PSW_MASK_DAT		_AC(0x04000000, UL)

#define PSW_MASK_IO		_AC(0x02000000, UL)

#define PSW_MASK_EXT		_AC(0x01000000, UL)

#define PSW_MASK_KEY		_AC(0x00F00000, UL)

#define PSW_MASK_BASE		_AC(0x00080000, UL)	/* always one */

#define PSW_MASK_MCHECK		_AC(0x00040000, UL)

#define PSW_MASK_WAIT		_AC(0x00020000, UL)

#define PSW_MASK_PSTATE		_AC(0x00010000, UL)

#define PSW_MASK_ASC		_AC(0x0000C000, UL)

#define PSW_MASK_CC		_AC(0x00003000, UL)

#define PSW_MASK_PM		_AC(0x00000F00, UL)

#define PSW_MASK_RI		_AC(0x00000000, UL)

#define PSW_MASK_EA		_AC(0x00000000, UL)

#define PSW_MASK_BA		_AC(0x00000000, UL)



#define PSW_MASK_USER		_AC(0x0000FF00, UL)



#define PSW_ADDR_AMODE		_AC(0x80000000, UL)

#define PSW_ADDR_INSN		_AC(0x7FFFFFFF, UL)



#define PSW_ASC_PRIMARY		_AC(0x00000000, UL)

#define PSW_ASC_ACCREG		_AC(0x00004000, UL)

#define PSW_ASC_SECONDARY	_AC(0x00008000, UL)

#define PSW_ASC_HOME		_AC(0x0000C000, UL)



#else /* __s390x__ */



#define PSW_MASK_PER		_AC(0x4000000000000000, UL)

#define PSW_MASK_DAT		_AC(0x0400000000000000, UL)

#define PSW_MASK_IO		_AC(0x0200000000000000, UL)
@@ -224,8 +104,6 @@ 
#define PSW_ASC_SECONDARY	_AC(0x0000800000000000, UL)

#define PSW_ASC_HOME		_AC(0x0000C00000000000, UL)



#endif /* __s390x__ */



#define NUM_GPRS	16

#define NUM_FPRS	16

#define NUM_CRS		16
@@ -308,9 +186,7 @@ typedef struct { 
#define PER_EM_MASK 0xE8000000UL



typedef struct {

#ifdef __s390x__

	unsigned		       : 32;

#endif /* __s390x__ */

	unsigned em_branching	       : 1;

	unsigned em_instruction_fetch  : 1;

	/*

arch/s390/include/uapi/asm/sigcontext.h

+0 −15
Original line number Diff line number Diff line
@@ -17,24 +17,12 @@ 
#define __NUM_VXRS_LOW		16

#define __NUM_VXRS_HIGH		16



#ifndef __s390x__



/* Has to be at least _NSIG_WORDS from asm/signal.h */

#define _SIGCONTEXT_NSIG	64

#define _SIGCONTEXT_NSIG_BPW	32

/* Size of stack frame allocated when calling signal handler. */

#define __SIGNAL_FRAMESIZE	96



#else /* __s390x__ */



/* Has to be at least _NSIG_WORDS from asm/signal.h */

#define _SIGCONTEXT_NSIG	64

#define _SIGCONTEXT_NSIG_BPW	64 

/* Size of stack frame allocated when calling signal handler. */

#define __SIGNAL_FRAMESIZE	160



#endif /* __s390x__ */



#define _SIGCONTEXT_NSIG_WORDS	(_SIGCONTEXT_NSIG / _SIGCONTEXT_NSIG_BPW)

#define _SIGMASK_COPY_SIZE	(sizeof(unsigned long)*_SIGCONTEXT_NSIG_WORDS)
@@ -66,9 +54,6 @@ typedef struct 


typedef struct

{

#ifndef __s390x__

	unsigned long gprs_high[__NUM_GPRS];

#endif

	unsigned long long vxrs_low[__NUM_VXRS_LOW];

	__vector128 vxrs_high[__NUM_VXRS_HIGH];

	unsigned char __reserved[128];