From: "Paolo 'Blaisorblade' Giarrusso" <blaisorblade@yahoo.it>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Jeff Dike <jdike@addtoit.com>,
user-mode-linux-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org
Subject: [uml-devel] [PATCH 05/10] uml: fix uname output on 32-bit binary on 64-bit host
Date: Wed, 21 Sep 2005 18:39:14 +0200 [thread overview]
Message-ID: <20050921163913.30500.72827.stgit@zion.home.lan> (raw)
In-Reply-To: <200509211822.17590.blaisorblade@yahoo.it>
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Translate uname output taken from the host if needed.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---
arch/um/kernel/user_util.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/um/kernel/user_util.c b/arch/um/kernel/user_util.c
--- a/arch/um/kernel/user_util.c
+++ b/arch/um/kernel/user_util.c
@@ -128,6 +128,12 @@ void setup_machinename(char *machine_out
struct utsname 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);
}
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
next prev parent reply other threads:[~2005-09-21 16:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-21 16:22 [uml-devel] [PATCH 0/10] Lots of UML fixups for 2.6.14 Blaisorblade
2005-09-21 16:37 ` [uml-devel] [PATCH 01/10] uml: adapt asm/futex.h to our arch Paolo 'Blaisorblade' Giarrusso
2005-09-21 16:38 ` [uml-devel] [PATCH 02/10] [ALL ARCHES] Remove unused var from asm/futex.h Paolo 'Blaisorblade' Giarrusso
2005-09-21 16:38 ` [uml-devel] [PATCH 03/10] uml: remove verify_area_{tt,skas} Paolo 'Blaisorblade' Giarrusso
2005-09-21 16:38 ` [uml-devel] [PATCH 04/10] uml: fix modify_ldt - missing break in switch Paolo 'Blaisorblade' Giarrusso
2005-09-21 16:39 ` Paolo 'Blaisorblade' Giarrusso [this message]
2005-09-21 16:39 ` [uml-devel] [PATCH 06/10] uml: Fix conflict between libc and ipv6 Paolo 'Blaisorblade' Giarrusso
2005-09-21 16:39 ` [uml-devel] [PATCH 07/10] uml: fix bogus HOST_ELF_CLASS symbol name Paolo 'Blaisorblade' Giarrusso
2005-09-21 16:40 ` [uml-devel] [PATCH 08/10] uml: readd removed unistd.h inclusion Paolo 'Blaisorblade' Giarrusso
2005-09-21 16:40 ` [uml-devel] [PATCH 09/10] uml: comment about cast build fix Paolo 'Blaisorblade' Giarrusso
2005-09-21 16:40 ` [uml-devel] [PATCH 10/10] uml: fix compile warning after consolidation patch Paolo 'Blaisorblade' Giarrusso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050921163913.30500.72827.stgit@zion.home.lan \
--to=blaisorblade@yahoo.it \
--cc=jdike@addtoit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox