Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / um / os-Linux / util.c

diff --git a/arch/um/os-Linux/util.c b/arch/um/os-Linux/util.c
index d224434d56106e5a06c34c7a691d8afba57c00b4..56b8a50e8bc2e08c3bfa5b7661b954599f5c6cee 100644 (file)
--- a/arch/um/os-Linux/util.c
+++ b/arch/um/os-Linux/util.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
-#include <setjmp.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/utsname.h>
@@ -30,6 +29,7 @@
 #include "ptrace_user.h"
 #include "uml-config.h"
 #include "os.h"
+#include "longjmp.h"
 
 void stack_protections(unsigned long address)
 {
@@ -80,11 +80,18 @@ void setup_machinename(char *machine_out)
        struct utsname host;
 
        uname(&host);
-#if defined(UML_CONFIG_UML_X86) && !defined(UML_CONFIG_64BIT)
+#ifdef UML_CONFIG_UML_X86
+# ifndef UML_CONFIG_64BIT
        if (!strcmp(host.machine, "x86_64")) {
                strcpy(machine_out, "i686");
                return;
        }
+# else
+       if (!strcmp(host.machine, "i686")) {
+               strcpy(machine_out, "x86_64");
+               return;
+       }
+# endif
 #endif
        strcpy(machine_out, host.machine);
 }
@@ -103,14 +110,14 @@ void setup_hostinfo(void)
 int setjmp_wrapper(void (*proc)(void *, void *), ...)
 {
        va_list args;
-       sigjmp_buf buf;
+       jmp_buf buf;
        int n;
 
-       n = sigsetjmp(buf, 1);
+       n = UML_SETJMP(&buf);
        if(n == 0){
                va_start(args, proc);
                (*proc)(&buf, &args);
        }
        va_end(args);
-       return(n);
+       return n;
 }