The patch titled
uml: UML/i386 is i386 when running on x86_64
has been added to the -mm tree. Its filename is
uml-uml-i386-is-i386-when-running-on-x86_64.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
comment-typo-fix.patch
shmem_populate-avoid-an-useless-check-and-some-comments.patch
remove-implied-vm_ops-check.patch
correct-_page_file-comment.patch
x86_64-remove-duplicated-sys_time64.patch
uml-rename-kconfig-files-to-be-like-the-other-arches.patch
ptrace-i386-fix-syscall-audit-interaction-with-singlestep.patch
uml-support-ptrace-adds-the-host-sysemu-support-for-uml-and-general-usage.patch
uml-support-reorganize-ptrace_sysemu-support.patch
uml-support-add-ptrace_sysemu_singlestep-option-to-i386.patch
sysemu-fix-sysaudit--singlestep-interaction.patch
uml-support-sysemu-slight-cleanup-and-speedup.patch
uml-workaround-gdb-problems-on-debugging.patch
uml-fix-sigwinch-handler-race-while-waiting-for-signals.patch
uml-fixes-performance-regression-in-activate_mm-and-thus-exec.patch
uml-fault-handler-micro-cleanups.patch
uml-error-path-cleanup.patch
uml-build-cleanup.patch
uml-remove-libc-reference-in-build.patch
uml-mark-smp-on-uml-x86_64-as-broken.patch
uml-remove-duplicated-exports.patch
uml-uml-i386-is-i386-when-running-on-x86_64.patch
uml-tlb-operation-batching.patch
uml-merge-duplicated-page-table-code.patch
From: Paolo Giarrusso <[EMAIL PROTECTED]>
Make a UML/i386 instance running on x86_64 pretend to be i386 rather than
x86_64.
Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
arch/um/kernel/user_util.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)
diff -puN
arch/um/kernel/user_util.c~uml-uml-i386-is-i386-when-running-on-x86_64
arch/um/kernel/user_util.c
---
devel/arch/um/kernel/user_util.c~uml-uml-i386-is-i386-when-running-on-x86_64
2005-08-30 00:11:19.000000000 -0700
+++ devel-akpm/arch/um/kernel/user_util.c 2005-08-30 00:11:19.000000000
-0700
@@ -132,7 +132,12 @@ void setup_machinename(char *machine_out
struct utsname host;
uname(&host);
- strcpy(machine_out, host.machine);
+ /* XXX: crude detection of 32-bit binary. */
+ if (sizeof(long) == 4 && !strcmp(host.machine, "x86_64")) {
+ strcpy(machine_out, "i686");
+ } else {
+ strcpy(machine_out, host.machine);
+ }
}
char host_info[(_UTSNAME_LENGTH + 1) * 4 + _UTSNAME_NODENAME_LENGTH + 1];
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
