git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
um
/
os-Linux
/
util.c
diff --git
a/arch/um/os-Linux/util.c
b/arch/um/os-Linux/util.c
index
e32065e
..
56b8a50
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 <stdlib.h>
#include <unistd.h>
#include <limits.h>
-#include <setjmp.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/utsname.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/utsname.h>
@@
-81,11
+80,18
@@
void setup_machinename(char *machine_out)
struct utsname host;
uname(&host);
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;
}
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);
}
#endif
strcpy(machine_out, host.machine);
}
@@
-104,14
+110,14
@@
void setup_hostinfo(void)
int setjmp_wrapper(void (*proc)(void *, void *), ...)
{
va_list args;
int setjmp_wrapper(void (*proc)(void *, void *), ...)
{
va_list args;
-
sig
jmp_buf buf;
+ jmp_buf buf;
int n;
int n;
- n =
sigsetjmp(buf, 1
);
+ n =
UML_SETJMP(&buf
);
if(n == 0){
va_start(args, proc);
(*proc)(&buf, &args);
}
va_end(args);
if(n == 0){
va_start(args, proc);
(*proc)(&buf, &args);
}
va_end(args);
- return
(n)
;
+ return
n
;
}
}