s390/traps: get rid of magic cast for program interruption code

Add a proper union in lowcore to reflect architecture and get rid of a
"magic" cast in order to read the full program interruption code.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index 1262f5003acfff7b912d96d2350a40f5cff997cf..28a2c6ba795e7a51433276f4051fc796a66a3b2c 100644 (file)
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -34,8 +34,13 @@ struct lowcore {
                __u32 ext_int_code_addr;
        };
        __u32   svc_int_code;                   /* 0x0088 */
-       __u16   pgm_ilc;                        /* 0x008c */
-       __u16   pgm_code;                       /* 0x008e */
+       union {
+               struct {
+                       __u16   pgm_ilc;        /* 0x008c */
+                       __u16   pgm_code;       /* 0x008e */
+               };
+               __u32 pgm_int_code;
+       };
        __u32   data_exc_code;                  /* 0x0090 */
        __u16   mon_class_num;                  /* 0x0094 */
        __u8    per_code;                       /* 0x0096 */

diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 7f0fadd10d68972e96b491c77b3005a432951a45..a3c94dfcbe16cfffbc9843ac41d384c1dbc6b597 100644 (file)
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -297,7 +297,7 @@ void noinstr __do_pgm_check(struct pt_regs *regs)
        unsigned int trapnr;
        irqentry_state_t state;
 
-       regs->int_code = *(u32 *)&S390_lowcore.pgm_ilc;
+       regs->int_code = S390_lowcore.pgm_int_code;
        regs->int_parm_long = S390_lowcore.trans_exc_code;
 
        state = irqentry_enter(regs);