Skip to content

Commit 3db5cf9

Browse files
hcahcahcahca
committed
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: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent 8e0b986 commit 3db5cf9

7 files changed

Lines changed: 0 additions & 233 deletions

File tree

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
#ifndef __ASM_S390_BITSPERLONG_H
33
#define __ASM_S390_BITSPERLONG_H
44

5-
#ifndef __s390x__
6-
#define __BITS_PER_LONG 32
7-
#else
85
#define __BITS_PER_LONG 64
9-
#endif
106

117
#include <asm-generic/bitsperlong.h>
128

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ struct ipc64_perm
2424
__kernel_mode_t mode;
2525
unsigned short __pad1;
2626
unsigned short seq;
27-
#ifndef __s390x__
28-
unsigned short __pad2;
29-
#endif /* ! __s390x__ */
3027
unsigned long __unused1;
3128
unsigned long __unused2;
3229
};

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,6 @@ typedef unsigned short __kernel_old_gid_t;
2626
#define __kernel_old_uid_t __kernel_old_uid_t
2727
#endif
2828

29-
#ifndef __s390x__
30-
31-
typedef unsigned long __kernel_ino_t;
32-
typedef unsigned short __kernel_mode_t;
33-
typedef unsigned short __kernel_ipc_pid_t;
34-
typedef unsigned short __kernel_uid_t;
35-
typedef unsigned short __kernel_gid_t;
36-
typedef int __kernel_ptrdiff_t;
37-
38-
#else /* __s390x__ */
39-
4029
typedef unsigned int __kernel_ino_t;
4130
typedef unsigned int __kernel_mode_t;
4231
typedef int __kernel_ipc_pid_t;
@@ -45,8 +34,6 @@ typedef unsigned int __kernel_gid_t;
4534
typedef long __kernel_ptrdiff_t;
4635
typedef unsigned long __kernel_sigset_t; /* at least 32 bits */
4736

48-
#endif /* __s390x__ */
49-
5037
#define __kernel_ino_t __kernel_ino_t
5138
#define __kernel_mode_t __kernel_mode_t
5239
#define __kernel_ipc_pid_t __kernel_ipc_pid_t

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

Lines changed: 0 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -14,94 +14,6 @@
1414
* Offsets in the user_regs_struct. They are used for the ptrace
1515
* system call and in entry.S
1616
*/
17-
#ifndef __s390x__
18-
19-
#define PT_PSWMASK 0x00
20-
#define PT_PSWADDR 0x04
21-
#define PT_GPR0 0x08
22-
#define PT_GPR1 0x0C
23-
#define PT_GPR2 0x10
24-
#define PT_GPR3 0x14
25-
#define PT_GPR4 0x18
26-
#define PT_GPR5 0x1C
27-
#define PT_GPR6 0x20
28-
#define PT_GPR7 0x24
29-
#define PT_GPR8 0x28
30-
#define PT_GPR9 0x2C
31-
#define PT_GPR10 0x30
32-
#define PT_GPR11 0x34
33-
#define PT_GPR12 0x38
34-
#define PT_GPR13 0x3C
35-
#define PT_GPR14 0x40
36-
#define PT_GPR15 0x44
37-
#define PT_ACR0 0x48
38-
#define PT_ACR1 0x4C
39-
#define PT_ACR2 0x50
40-
#define PT_ACR3 0x54
41-
#define PT_ACR4 0x58
42-
#define PT_ACR5 0x5C
43-
#define PT_ACR6 0x60
44-
#define PT_ACR7 0x64
45-
#define PT_ACR8 0x68
46-
#define PT_ACR9 0x6C
47-
#define PT_ACR10 0x70
48-
#define PT_ACR11 0x74
49-
#define PT_ACR12 0x78
50-
#define PT_ACR13 0x7C
51-
#define PT_ACR14 0x80
52-
#define PT_ACR15 0x84
53-
#define PT_ORIGGPR2 0x88
54-
#define PT_FPC 0x90
55-
/*
56-
* A nasty fact of life that the ptrace api
57-
* only supports passing of longs.
58-
*/
59-
#define PT_FPR0_HI 0x98
60-
#define PT_FPR0_LO 0x9C
61-
#define PT_FPR1_HI 0xA0
62-
#define PT_FPR1_LO 0xA4
63-
#define PT_FPR2_HI 0xA8
64-
#define PT_FPR2_LO 0xAC
65-
#define PT_FPR3_HI 0xB0
66-
#define PT_FPR3_LO 0xB4
67-
#define PT_FPR4_HI 0xB8
68-
#define PT_FPR4_LO 0xBC
69-
#define PT_FPR5_HI 0xC0
70-
#define PT_FPR5_LO 0xC4
71-
#define PT_FPR6_HI 0xC8
72-
#define PT_FPR6_LO 0xCC
73-
#define PT_FPR7_HI 0xD0
74-
#define PT_FPR7_LO 0xD4
75-
#define PT_FPR8_HI 0xD8
76-
#define PT_FPR8_LO 0XDC
77-
#define PT_FPR9_HI 0xE0
78-
#define PT_FPR9_LO 0xE4
79-
#define PT_FPR10_HI 0xE8
80-
#define PT_FPR10_LO 0xEC
81-
#define PT_FPR11_HI 0xF0
82-
#define PT_FPR11_LO 0xF4
83-
#define PT_FPR12_HI 0xF8
84-
#define PT_FPR12_LO 0xFC
85-
#define PT_FPR13_HI 0x100
86-
#define PT_FPR13_LO 0x104
87-
#define PT_FPR14_HI 0x108
88-
#define PT_FPR14_LO 0x10C
89-
#define PT_FPR15_HI 0x110
90-
#define PT_FPR15_LO 0x114
91-
#define PT_CR_9 0x118
92-
#define PT_CR_10 0x11C
93-
#define PT_CR_11 0x120
94-
#define PT_IEEE_IP 0x13C
95-
#define PT_LASTOFF PT_IEEE_IP
96-
#define PT_ENDREGS 0x140-1
97-
98-
#define GPR_SIZE 4
99-
#define CR_SIZE 4
100-
101-
#define STACK_FRAME_OVERHEAD 96 /* size of minimum stack frame */
102-
103-
#else /* __s390x__ */
104-
10517
#define PT_PSWMASK 0x00
10618
#define PT_PSWADDR 0x08
10719
#define PT_GPR0 0x10
@@ -166,38 +78,6 @@
16678

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

169-
#endif /* __s390x__ */
170-
171-
#ifndef __s390x__
172-
173-
#define PSW_MASK_PER _AC(0x40000000, UL)
174-
#define PSW_MASK_DAT _AC(0x04000000, UL)
175-
#define PSW_MASK_IO _AC(0x02000000, UL)
176-
#define PSW_MASK_EXT _AC(0x01000000, UL)
177-
#define PSW_MASK_KEY _AC(0x00F00000, UL)
178-
#define PSW_MASK_BASE _AC(0x00080000, UL) /* always one */
179-
#define PSW_MASK_MCHECK _AC(0x00040000, UL)
180-
#define PSW_MASK_WAIT _AC(0x00020000, UL)
181-
#define PSW_MASK_PSTATE _AC(0x00010000, UL)
182-
#define PSW_MASK_ASC _AC(0x0000C000, UL)
183-
#define PSW_MASK_CC _AC(0x00003000, UL)
184-
#define PSW_MASK_PM _AC(0x00000F00, UL)
185-
#define PSW_MASK_RI _AC(0x00000000, UL)
186-
#define PSW_MASK_EA _AC(0x00000000, UL)
187-
#define PSW_MASK_BA _AC(0x00000000, UL)
188-
189-
#define PSW_MASK_USER _AC(0x0000FF00, UL)
190-
191-
#define PSW_ADDR_AMODE _AC(0x80000000, UL)
192-
#define PSW_ADDR_INSN _AC(0x7FFFFFFF, UL)
193-
194-
#define PSW_ASC_PRIMARY _AC(0x00000000, UL)
195-
#define PSW_ASC_ACCREG _AC(0x00004000, UL)
196-
#define PSW_ASC_SECONDARY _AC(0x00008000, UL)
197-
#define PSW_ASC_HOME _AC(0x0000C000, UL)
198-
199-
#else /* __s390x__ */
200-
20181
#define PSW_MASK_PER _AC(0x4000000000000000, UL)
20282
#define PSW_MASK_DAT _AC(0x0400000000000000, UL)
20383
#define PSW_MASK_IO _AC(0x0200000000000000, UL)
@@ -224,8 +104,6 @@
224104
#define PSW_ASC_SECONDARY _AC(0x0000800000000000, UL)
225105
#define PSW_ASC_HOME _AC(0x0000C00000000000, UL)
226106

227-
#endif /* __s390x__ */
228-
229107
#define NUM_GPRS 16
230108
#define NUM_FPRS 16
231109
#define NUM_CRS 16
@@ -308,9 +186,7 @@ typedef struct {
308186
#define PER_EM_MASK 0xE8000000UL
309187

310188
typedef struct {
311-
#ifdef __s390x__
312189
unsigned : 32;
313-
#endif /* __s390x__ */
314190
unsigned em_branching : 1;
315191
unsigned em_instruction_fetch : 1;
316192
/*

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,12 @@
1717
#define __NUM_VXRS_LOW 16
1818
#define __NUM_VXRS_HIGH 16
1919

20-
#ifndef __s390x__
21-
22-
/* Has to be at least _NSIG_WORDS from asm/signal.h */
23-
#define _SIGCONTEXT_NSIG 64
24-
#define _SIGCONTEXT_NSIG_BPW 32
25-
/* Size of stack frame allocated when calling signal handler. */
26-
#define __SIGNAL_FRAMESIZE 96
27-
28-
#else /* __s390x__ */
29-
3020
/* Has to be at least _NSIG_WORDS from asm/signal.h */
3121
#define _SIGCONTEXT_NSIG 64
3222
#define _SIGCONTEXT_NSIG_BPW 64
3323
/* Size of stack frame allocated when calling signal handler. */
3424
#define __SIGNAL_FRAMESIZE 160
3525

36-
#endif /* __s390x__ */
37-
3826
#define _SIGCONTEXT_NSIG_WORDS (_SIGCONTEXT_NSIG / _SIGCONTEXT_NSIG_BPW)
3927
#define _SIGMASK_COPY_SIZE (sizeof(unsigned long)*_SIGCONTEXT_NSIG_WORDS)
4028

@@ -66,9 +54,6 @@ typedef struct
6654

6755
typedef struct
6856
{
69-
#ifndef __s390x__
70-
unsigned long gprs_high[__NUM_GPRS];
71-
#endif
7257
unsigned long long vxrs_low[__NUM_VXRS_LOW];
7358
__vector128 vxrs_high[__NUM_VXRS_HIGH];
7459
unsigned char __reserved[128];

‎arch/s390/include/uapi/asm/stat.h‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -8,74 +8,6 @@
88
#ifndef _S390_STAT_H
99
#define _S390_STAT_H
1010

11-
#ifndef __s390x__
12-
struct __old_kernel_stat {
13-
unsigned short st_dev;
14-
unsigned short st_ino;
15-
unsigned short st_mode;
16-
unsigned short st_nlink;
17-
unsigned short st_uid;
18-
unsigned short st_gid;
19-
unsigned short st_rdev;
20-
unsigned long st_size;
21-
unsigned long st_atime;
22-
unsigned long st_mtime;
23-
unsigned long st_ctime;
24-
};
25-
26-
struct stat {
27-
unsigned short st_dev;
28-
unsigned short __pad1;
29-
unsigned long st_ino;
30-
unsigned short st_mode;
31-
unsigned short st_nlink;
32-
unsigned short st_uid;
33-
unsigned short st_gid;
34-
unsigned short st_rdev;
35-
unsigned short __pad2;
36-
unsigned long st_size;
37-
unsigned long st_blksize;
38-
unsigned long st_blocks;
39-
unsigned long st_atime;
40-
unsigned long st_atime_nsec;
41-
unsigned long st_mtime;
42-
unsigned long st_mtime_nsec;
43-
unsigned long st_ctime;
44-
unsigned long st_ctime_nsec;
45-
unsigned long __unused4;
46-
unsigned long __unused5;
47-
};
48-
49-
/* This matches struct stat64 in glibc2.1, hence the absolutely
50-
* insane amounts of padding around dev_t's.
51-
*/
52-
struct stat64 {
53-
unsigned long long st_dev;
54-
unsigned int __pad1;
55-
#define STAT64_HAS_BROKEN_ST_INO 1
56-
unsigned long __st_ino;
57-
unsigned int st_mode;
58-
unsigned int st_nlink;
59-
unsigned long st_uid;
60-
unsigned long st_gid;
61-
unsigned long long st_rdev;
62-
unsigned int __pad3;
63-
long long st_size;
64-
unsigned long st_blksize;
65-
unsigned char __pad4[4];
66-
unsigned long __pad5; /* future possible st_blocks high bits */
67-
unsigned long st_blocks; /* Number 512-byte blocks allocated. */
68-
unsigned long st_atime;
69-
unsigned long st_atime_nsec;
70-
unsigned long st_mtime;
71-
unsigned long st_mtime_nsec;
72-
unsigned long st_ctime;
73-
unsigned long st_ctime_nsec; /* will be high 32 bits of ctime someday */
74-
unsigned long long st_ino;
75-
};
76-
77-
#else /* __s390x__ */
78-
7911
struct stat {
8012
unsigned long st_dev;
8113
unsigned long st_ino;
@@ -97,8 +29,6 @@ struct stat {
9729
unsigned long __unused[3];
9830
};
9931

100-
#endif /* __s390x__ */
101-
10232
#define STAT_HAVE_NSEC 1
10333

10434
#endif

‎arch/s390/include/uapi/asm/unistd.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
#ifndef _UAPI_ASM_S390_UNISTD_H_
99
#define _UAPI_ASM_S390_UNISTD_H_
1010

11-
#ifdef __s390x__
1211
#include <asm/unistd_64.h>
13-
#else
14-
#include <asm/unistd_32.h>
15-
#endif
1612

1713
#endif /* _UAPI_ASM_S390_UNISTD_H_ */

0 commit comments

Comments
 (0)