1 files changed, 7 insertions, 4 deletions

diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 2d6228f60cd6..bb48977f5469 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -170,7 +170,8 @@ void __kprobes vtime_stop_cpu(void)
         psw_t psw;
 
         /* Wait for external, I/O or machine check interrupt. */
-        psw.mask = psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_IO | PSW_MASK_EXT;
+        psw.mask = psw_kernel_bits | PSW_MASK_WAIT |
+                PSW_MASK_DAT | PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK;
 
         idle->nohz_delay = 0;
 
@@ -183,7 +184,8 @@ void __kprobes vtime_stop_cpu(void)
                  *      set_cpu_timer(VTIMER_MAX_SLICE);
                  *      idle->idle_enter = get_clock();
                  *      __load_psw_mask(psw_kernel_bits | PSW_MASK_WAIT |
-                 *                         PSW_MASK_IO | PSW_MASK_EXT);
+                 *                         PSW_MASK_DAT | PSW_MASK_IO |
+                 *                         PSW_MASK_EXT | PSW_MASK_MCHECK);
                  * The difference is that the inline assembly makes sure that
                  * the last three instruction are stpt, stck and lpsw in that
                  * order. This is done to increase the precision.
@@ -216,7 +218,8 @@ void __kprobes vtime_stop_cpu(void)
                  *      vq->idle = get_cpu_timer();
                  *      idle->idle_enter = get_clock();
                  *      __load_psw_mask(psw_kernel_bits | PSW_MASK_WAIT |
-                 *                         PSW_MASK_IO | PSW_MASK_EXT);
+                 *                         PSW_MASK_DAT | PSW_MASK_IO |
+                 *                         PSW_MASK_EXT | PSW_MASK_MCHECK);
                  * The difference is that the inline assembly makes sure that
                  * the last three instruction are stpt, stck and lpsw in that
                  * order. This is done to increase the precision.
@@ -458,7 +461,7 @@ void add_virt_timer_periodic(void *new)
 }
 EXPORT_SYMBOL(add_virt_timer_periodic);
 
-int __mod_vtimer(struct vtimer_list *timer, __u64 expires, int periodic)
+static int __mod_vtimer(struct vtimer_list *timer, __u64 expires, int periodic)
 {
         struct vtimer_queue *vq;
         unsigned long flags;