1 files changed, 15 insertions, 11 deletions

diff --git a/arch/um/os-Linux/util.c b/arch/um/os-Linux/util.c
index 56b8a50e8bc2..c307a89ed259 100644
--- a/arch/um/os-Linux/util.c
+++ b/arch/um/os-Linux/util.c
@@ -21,7 +21,6 @@
 #include <sched.h>
 #include <termios.h>
 #include <string.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "mem_user.h"
@@ -30,28 +29,29 @@
 #include "uml-config.h"
 #include "os.h"
 #include "longjmp.h"
+#include "kern_constants.h"
 
 void stack_protections(unsigned long address)
 {
         int prot = PROT_READ | PROT_WRITE | PROT_EXEC;
 
-        if(mprotect((void *) address, page_size(), prot) < 0)
+        if(mprotect((void *) address, UM_KERN_PAGE_SIZE, prot) < 0)
                 panic("protecting stack failed, errno = %d", errno);
 }
 
 void task_protections(unsigned long address)
 {
-        unsigned long guard = address + page_size();
-        unsigned long stack = guard + page_size();
+        unsigned long guard = address + UM_KERN_PAGE_SIZE;
+        unsigned long stack = guard + UM_KERN_PAGE_SIZE;
         int prot = 0, pages;
 
 #ifdef notdef
-        if(mprotect((void *) stack, page_size(), prot) < 0)
+        if(mprotect((void *) stack, UM_KERN_PAGE_SIZE, prot) < 0)
                 panic("protecting guard page failed, errno = %d", errno);
 #endif
         pages = (1 << UML_CONFIG_KERNEL_STACK_ORDER) - 2;
         prot = PROT_READ | PROT_WRITE | PROT_EXEC;
-        if(mprotect((void *) stack, pages * page_size(), prot) < 0)
+        if(mprotect((void *) stack, pages * UM_KERN_PAGE_SIZE, prot) < 0)
                 panic("protecting stack failed, errno = %d", errno);
 }
 
@@ -96,15 +96,13 @@ void setup_machinename(char *machine_out)
         strcpy(machine_out, host.machine);
 }
 
-char host_info[(_UTSNAME_LENGTH + 1) * 4 + _UTSNAME_NODENAME_LENGTH + 1];
-
-void setup_hostinfo(void)
+void setup_hostinfo(char *buf, int len)
 {
         struct utsname host;
 
         uname(&host);
-        sprintf(host_info, "%s %s %s %s %s", host.sysname, host.nodename,
-                host.release, host.version, host.machine);
+        snprintf(buf, len, "%s %s %s %s %s", host.sysname, host.nodename,
+                 host.release, host.version, host.machine);
 }
 
 int setjmp_wrapper(void (*proc)(void *, void *), ...)
@@ -121,3 +119,9 @@ int setjmp_wrapper(void (*proc)(void *, void *), ...)
         va_end(args);
         return n;
 }
+
+void os_dump_core(void)
+{
+        signal(SIGSEGV, SIG_DFL);
+        abort();
+}