3 files changed, 59 insertions, 30 deletions

diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index 880b0ebf894b..ed2af0a3303b 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -289,22 +289,8 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
 
         rc = add_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
 
-        switch (rc) {
-        case 0:
-                break;
-        case -ENOSPC:
-                PRINT_WARN("segment_load: not loading segment %s - overlaps "
-                           "storage/segment\n", name);
-                goto out_free;
-        case -ERANGE:
-                PRINT_WARN("segment_load: not loading segment %s - exceeds "
-                           "kernel mapping range\n", name);
-                goto out_free;
-        default:
-                PRINT_WARN("segment_load: not loading segment %s (rc: %d)\n",
-                           name, rc);
+        if (rc)
                 goto out_free;
-        }
 
         seg->res = kzalloc(sizeof(struct resource), GFP_KERNEL);
         if (seg->res == NULL) {
@@ -582,8 +568,59 @@ out:
         mutex_unlock(&dcss_lock);
 }
 
+/*
+ * print appropriate error message for segment_load()/segment_type()
+ * return code
+ */
+void segment_warning(int rc, char *seg_name)
+{
+        switch (rc) {
+        case -ENOENT:
+                PRINT_WARN("cannot load/query segment %s, "
+                           "does not exist\n", seg_name);
+                break;
+        case -ENOSYS:
+                PRINT_WARN("cannot load/query segment %s, "
+                           "not running on VM\n", seg_name);
+                break;
+        case -EIO:
+                PRINT_WARN("cannot load/query segment %s, "
+                           "hardware error\n", seg_name);
+                break;
+        case -ENOTSUPP:
+                PRINT_WARN("cannot load/query segment %s, "
+                           "is a multi-part segment\n", seg_name);
+                break;
+        case -ENOSPC:
+                PRINT_WARN("cannot load/query segment %s, "
+                           "overlaps with storage\n", seg_name);
+                break;
+        case -EBUSY:
+                PRINT_WARN("cannot load/query segment %s, "
+                           "overlaps with already loaded dcss\n", seg_name);
+                break;
+        case -EPERM:
+                PRINT_WARN("cannot load/query segment %s, "
+                           "already loaded in incompatible mode\n", seg_name);
+                break;
+        case -ENOMEM:
+                PRINT_WARN("cannot load/query segment %s, "
+                           "out of memory\n", seg_name);
+                break;
+        case -ERANGE:
+                PRINT_WARN("cannot load/query segment %s, "
+                           "exceeds kernel mapping range\n", seg_name);
+                break;
+        default:
+                PRINT_WARN("cannot load/query segment %s, "
+                           "return value %i\n", seg_name, rc);
+                break;
+        }
+}
+
 EXPORT_SYMBOL(segment_load);
 EXPORT_SYMBOL(segment_unload);
 EXPORT_SYMBOL(segment_save);
 EXPORT_SYMBOL(segment_type);
 EXPORT_SYMBOL(segment_modify_shared);
+EXPORT_SYMBOL(segment_warning);
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index ed13d429a487..2650f46001d0 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -28,11 +28,11 @@
 #include <linux/hardirq.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
-
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/s390_ext.h>
 #include <asm/mmu_context.h>
+#include "../kernel/entry.h"
 
 #ifndef CONFIG_64BIT
 #define __FAIL_ADDR_MASK 0x7ffff000
@@ -50,8 +50,6 @@
 extern int sysctl_userprocess_debug;
 #endif
 
-extern void die(const char *,struct pt_regs *,long);
-
 #ifdef CONFIG_KPROBES
 static inline int notify_page_fault(struct pt_regs *regs, long err)
 {
@@ -245,11 +243,6 @@ static void do_sigbus(struct pt_regs *regs, unsigned long error_code,
 }
 
 #ifdef CONFIG_S390_EXEC_PROTECT
-extern long sys_sigreturn(struct pt_regs *regs);
-extern long sys_rt_sigreturn(struct pt_regs *regs);
-extern long sys32_sigreturn(struct pt_regs *regs);
-extern long sys32_rt_sigreturn(struct pt_regs *regs);
-
 static int signal_return(struct mm_struct *mm, struct pt_regs *regs,
                          unsigned long address, unsigned long error_code)
 {
@@ -270,15 +263,15 @@ static int signal_return(struct mm_struct *mm, struct pt_regs *regs,
 #ifdef CONFIG_COMPAT
         compat = test_tsk_thread_flag(current, TIF_31BIT);
         if (compat && instruction == 0x0a77)
-                sys32_sigreturn(regs);
+                sys32_sigreturn();
         else if (compat && instruction == 0x0aad)
-                sys32_rt_sigreturn(regs);
+                sys32_rt_sigreturn();
         else
 #endif
         if (instruction == 0x0a77)
-                sys_sigreturn(regs);
+                sys_sigreturn();
         else if (instruction == 0x0aad)
-                sys_rt_sigreturn(regs);
+                sys_rt_sigreturn();
         else {
                 current->thread.prot_addr = address;
                 current->thread.trap_no = error_code;
@@ -424,7 +417,7 @@ no_context:
 }
 
 void __kprobes do_protection_exception(struct pt_regs *regs,
-                                       unsigned long error_code)
+                                       long error_code)
 {
         /* Protection exception is supressing, decrement psw address. */
         regs->psw.addr -= (error_code >> 16);
@@ -440,7 +433,7 @@ void __kprobes do_protection_exception(struct pt_regs *regs,
         do_exception(regs, 4, 1);
 }
 
-void __kprobes do_dat_exception(struct pt_regs *regs, unsigned long error_code)
+void __kprobes do_dat_exception(struct pt_regs *regs, long error_code)
 {
         do_exception(regs, error_code & 0xff, 0);
 }
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 8053245fe259..202c952a29b4 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -50,7 +50,6 @@ void show_mem(void)
 
         printk("Mem-info:\n");
         show_free_areas();
-        printk("Free swap:       %6ldkB\n", nr_swap_pages << (PAGE_SHIFT - 10));
         i = max_mapnr;
         while (i-- > 0) {
                 if (!pfn_valid(i))