aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2015-12-31 03:58:02 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-01-11 06:27:07 -0500
commitcb951785a78c68bf802f5e3d9016b0205ddd24c2 (patch)
treecc51fae4b9bdc5e471db79aaf529c283c4819334
parent7022ec496005b47257b8c0a1c1a40df92df7c79f (diff)
s390/ptrace: get rid of long longs in psw_bits
The long longs were introduced by me in order to have a working definition of the struct psw_bits also in 31 bit mode. Since that is gone also get rid of the long longs. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/include/asm/ptrace.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index 37cbc50947f2..f00cd35c8ac4 100644
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@ -24,25 +24,25 @@
24 PSW_MASK_PSTATE | PSW_ASC_PRIMARY) 24 PSW_MASK_PSTATE | PSW_ASC_PRIMARY)
25 25
26struct psw_bits { 26struct psw_bits {
27 unsigned long long : 1; 27 unsigned long : 1;
28 unsigned long long r : 1; /* PER-Mask */ 28 unsigned long r : 1; /* PER-Mask */
29 unsigned long long : 3; 29 unsigned long : 3;
30 unsigned long long t : 1; /* DAT Mode */ 30 unsigned long t : 1; /* DAT Mode */
31 unsigned long long i : 1; /* Input/Output Mask */ 31 unsigned long i : 1; /* Input/Output Mask */
32 unsigned long long e : 1; /* External Mask */ 32 unsigned long e : 1; /* External Mask */
33 unsigned long long key : 4; /* PSW Key */ 33 unsigned long key : 4; /* PSW Key */
34 unsigned long long : 1; 34 unsigned long : 1;
35 unsigned long long m : 1; /* Machine-Check Mask */ 35 unsigned long m : 1; /* Machine-Check Mask */
36 unsigned long long w : 1; /* Wait State */ 36 unsigned long w : 1; /* Wait State */
37 unsigned long long p : 1; /* Problem State */ 37 unsigned long p : 1; /* Problem State */
38 unsigned long long as : 2; /* Address Space Control */ 38 unsigned long as : 2; /* Address Space Control */
39 unsigned long long cc : 2; /* Condition Code */ 39 unsigned long cc : 2; /* Condition Code */
40 unsigned long long pm : 4; /* Program Mask */ 40 unsigned long pm : 4; /* Program Mask */
41 unsigned long long ri : 1; /* Runtime Instrumentation */ 41 unsigned long ri : 1; /* Runtime Instrumentation */
42 unsigned long long : 6; 42 unsigned long : 6;
43 unsigned long long eaba : 2; /* Addressing Mode */ 43 unsigned long eaba : 2; /* Addressing Mode */
44 unsigned long long : 31; 44 unsigned long : 31;
45 unsigned long long ia : 64;/* Instruction Address */ 45 unsigned long ia : 64; /* Instruction Address */
46}; 46};
47 47
48enum { 48enum {