s390/traps: Copy monitor code to pt_regs

In case of a monitor call program check the CPU stores the monitor code to
lowcore. Let the program check handler copy it to the pt_regs structure so
it can be used by the monitor call exception handler.

Instead of increasing the pt_regs size add a union which contains both
orig_gpr2 and monitor_code, since orig_gpr2 is not used in case of a
program check.

Reviewed-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index e6ec0ccf3d737dfb144876942d200004b1fae470..aaceb1d9110a4dd16d9bec9231a6912044855146 100644 (file)
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@ -120,7 +120,10 @@ struct pt_regs {
                        unsigned long gprs[NUM_GPRS];
                };
        };
-       unsigned long orig_gpr2;
+       union {
+               unsigned long orig_gpr2;
+               unsigned long monitor_code;
+       };
        union {
                struct {
                        unsigned int int_code;

diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index de63e98e724bf66b6d22bd6118e156fe300fec44..b2d6d7cc3b176d5fce21f8f8282f1bf28fb1ef82 100644 (file)
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -298,6 +298,7 @@ void noinstr __do_pgm_check(struct pt_regs *regs)
        teid.val = lc->trans_exc_code;
        regs->int_code = lc->pgm_int_code;
        regs->int_parm_long = teid.val;
+       regs->monitor_code = lc->monitor_code;
        /*
         * In case of a guest fault, short-circuit the fault handler and return.
         * This way the sie64a() function will return 0; fault address and