redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] uml: fix uname under setarch i386

Browse source 
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>
This commit is contained in:
Paolo 'Blaisorblade' Giarrusso 2006-10-11 01:21:36 -07:00 committed by Linus Torvalds
parent 1b4ad242fc
commit 69fada32d8
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/um/os-Linux/util.c
View file

@ -80,11 +80,18 @@ void setup_machinename(char *machine_out)
struct utsname host; struct utsname host;
uname(&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")) { if (!strcmp(host.machine, "x86_64")) {
strcpy(machine_out, "i686"); strcpy(machine_out, "i686");
return; return;
} }
# else
if (!strcmp(host.machine, "i686")) {
strcpy(machine_out, "x86_64");
return;
}
# endif
#endif #endif
strcpy(machine_out, host.machine); strcpy(machine_out, host.machine);
} }