7 files changed, 72 insertions, 10 deletions

diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index 5291b5f8788d..b4c815d8ef75 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -430,7 +430,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
 
         /* This is the X/Open sanctioned signal stack switching.  */
         if (ka->sa.sa_flags & SA_ONSTACK) {
-                if (! on_sig_stack(sp))
+                if (! sas_ss_flags(sp))
                         sp = current->sas_ss_sp + current->sas_ss_size;
         }
 
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 199da68bd7be..ef5b9c44b86b 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -1608,3 +1608,45 @@ compat_sys_ppoll_wrapper:
 sys_unshare_wrapper:
         llgfr   %r2,%r2                 # unsigned long
         jg      sys_unshare
+
+        .globl compat_sys_set_robust_list_wrapper
+compat_sys_set_robust_list_wrapper:
+        llgtr   %r2,%r2                 # struct compat_robust_list_head *
+        llgfr   %r3,%r3                 # size_t
+        jg      compat_sys_set_robust_list
+
+        .globl compat_sys_get_robust_list_wrapper
+compat_sys_get_robust_list_wrapper:
+        lgfr    %r2,%r2                 # int
+        llgtr   %r3,%r3                 # compat_uptr_t_t *
+        llgtr   %r4,%r4                 # compat_size_t *
+        jg      compat_sys_get_robust_list
+
+        .globl sys_splice_wrapper
+sys_splice_wrapper:
+        lgfr    %r2,%r2                 # int
+        llgtr   %r3,%r3                 # loff_t *
+        lgfr    %r4,%r4                 # int
+        llgtr   %r5,%r5                 # loff_t *
+        llgfr   %r6,%r6                 # size_t
+        llgf    %r0,164(%r15)           # unsigned int
+        stg     %r0,160(%r15)
+        jg      sys_splice
+
+        .globl  sys_sync_file_range_wrapper
+sys_sync_file_range_wrapper:
+        lgfr    %r2,%r2                 # int
+        sllg    %r3,%r3,32              # get high word of 64bit loff_t
+        or      %r3,%r4                 # get low word of 64bit loff_t
+        sllg    %r4,%r5,32              # get high word of 64bit loff_t
+        or      %r4,%r6                 # get low word of 64bit loff_t
+        llgf    %r5,164(%r15)           # unsigned int
+        jg      sys_sync_file_range
+
+        .globl  sys_tee_wrapper
+sys_tee_wrapper:
+        lgfr    %r2,%r2                 # int
+        lgfr    %r3,%r3                 # int
+        llgfr   %r4,%r4                 # size_t
+        llgfr   %r5,%r5                 # unsigned int
+        jg      sys_tee
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 37dfe33dab73..8f36504075ed 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -734,7 +734,7 @@ asmlinkage void
 syscall_trace(struct pt_regs *regs, int entryexit)
 {
         if (unlikely(current->audit_context) && entryexit)
-                audit_syscall_exit(current, AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
+                audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
 
         if (!test_thread_flag(TIF_SYSCALL_TRACE))
                 goto out;
@@ -761,8 +761,7 @@ syscall_trace(struct pt_regs *regs, int entryexit)
         }
  out:
         if (unlikely(current->audit_context) && !entryexit)
-                audit_syscall_entry(current, 
-                                    test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X,
+                audit_syscall_entry(test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X,
                                     regs->gprs[2], regs->orig_gpr2, regs->gprs[3],
                                     regs->gprs[4], regs->gprs[5]);
 }
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index ae1927e48cfb..d48cfc726b68 100644
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -358,8 +358,9 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         } else {
                 regs->gprs[14] = (unsigned long)
                         frame->retcode | PSW_ADDR_AMODE;
-                err |= __put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn,
-                                  (u16 __user *)(frame->retcode));
+                if (__put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn,
+                               (u16 __user *)(frame->retcode)))
+                        goto give_sigsegv;
         }
 
         /* Set up backchain. */
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 2f56654da821..fc2c0767202b 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -312,3 +312,8 @@ SYSCALL(sys_faccessat,sys_faccessat,sys_faccessat_wrapper)	/* 300 */
 SYSCALL(sys_pselect6,sys_pselect6,compat_sys_pselect6_wrapper)
 SYSCALL(sys_ppoll,sys_ppoll,compat_sys_ppoll_wrapper)
 SYSCALL(sys_unshare,sys_unshare,sys_unshare_wrapper)
+SYSCALL(sys_set_robust_list,sys_set_robust_list,compat_sys_set_robust_list_wrapper)
+SYSCALL(sys_get_robust_list,sys_get_robust_list,compat_sys_get_robust_list_wrapper)
+SYSCALL(sys_splice,sys_splice,sys_splice_wrapper)
+SYSCALL(sys_sync_file_range,sys_sync_file_range,sys_sync_file_range_wrapper)
+SYSCALL(sys_tee,sys_tee,sys_tee_wrapper)
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 9289face3027..9f34bb54c051 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -58,9 +58,11 @@ SECTIONS
   . = ALIGN(4096);
   .data.page_aligned : { *(.data.idt) }
 
-  . = ALIGN(32);
+  . = ALIGN(256);
   .data.cacheline_aligned : { *(.data.cacheline_aligned) }
 
+  . = ALIGN(256);
+  .data.read_mostly : { *(.data.read_mostly) }
   _edata = .;                   /* End of data section */
 
   . = ALIGN(8192);              /* init_task */
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index a9566bcab682..9b11e3e20903 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -192,6 +192,7 @@ query_segment_type (struct dcss_segment *seg)
         diag_cc = dcss_diag (DCSS_SEGEXT, qin, &dummy, &vmrc);
 
         if (diag_cc > 1) {
+                PRINT_WARN ("segment_type: diag returned error %ld\n", vmrc);
                 rc = dcss_diag_translate_rc (vmrc);
                 goto out_free;
         }
@@ -553,7 +554,7 @@ segment_save(char *name)
         int endpfn = 0;
         char cmd1[160];
         char cmd2[80];
-        int i;
+        int i, response;
 
         if (!MACHINE_IS_VM)
                 return;
@@ -576,8 +577,20 @@ segment_save(char *name)
                         segtype_string[seg->range[i].start & 0xff]);
         }
         sprintf(cmd2, "SAVESEG %s", name);
-        cpcmd(cmd1, NULL, 0, NULL);
-        cpcmd(cmd2, NULL, 0, NULL);
+        response = 0;
+        cpcmd(cmd1, NULL, 0, &response);
+        if (response) {
+                PRINT_ERR("segment_save: DEFSEG failed with response code %i\n",
+                          response);
+                goto out;
+        }
+        cpcmd(cmd2, NULL, 0, &response);
+        if (response) {
+                PRINT_ERR("segment_save: SAVESEG failed with response code %i\n",
+                          response);
+                goto out;
+        }
+out:
         spin_unlock(&dcss_lock);
 }