Commit 8e5cb35a authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds

[PATCH] uml: fix uname output on 32-bit binary on 64-bit host

Translate uname output taken from the host if needed.
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 36decba9
...@@ -128,6 +128,12 @@ void setup_machinename(char *machine_out) ...@@ -128,6 +128,12 @@ 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)
if (!strcmp(host.machine, "x86_64")) {
strcpy(machine_out, "i686");
return;
}
#endif
strcpy(machine_out, host.machine); strcpy(machine_out, host.machine);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment