diff options
| author | Paolo 'Blaisorblade' Giarrusso | 2006-10-11 10:21:36 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-10-11 20:14:20 +0200 |
| commit | 69fada32d868d7f4be128ea4df8fbe4fd897fc34 (patch) | |
| tree | ab216b52da48f39a418b1f67671c3fb05fce33df | |
| parent | [PATCH] uml: fix processor selection to exclude unsupported processors and fe... (diff) | |
| download | kernel-qcow2-linux-69fada32d868d7f4be128ea4df8fbe4fd897fc34.tar.gz kernel-qcow2-linux-69fada32d868d7f4be128ea4df8fbe4fd897fc34.tar.xz kernel-qcow2-linux-69fada32d868d7f4be128ea4df8fbe4fd897fc34.zip | |
[PATCH] uml: fix uname under setarch i386
On a 64bit Uml, if run under "setarch i386" (which a user did), uname()
currently returns the obtained i686 as machine - fix that. Btw, I'm quite
surprised that under setarch i386 a 64-bit binary can run.
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/um/os-Linux/util.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/um/os-Linux/util.c b/arch/um/os-Linux/util.c index 3f5b1514e8a7..56b8a50e8bc2 100644 --- a/arch/um/os-Linux/util.c +++ b/arch/um/os-Linux/util.c @@ -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); } |