2004-11-04 02:06:56

by Blaisorblade

[permalink] [raw]
Subject: [patch 13/20] Uml: revert compile-only changes for other ones


I'm reverting the compile-time fixes to replace them with a bigger change,
which also happens to fix the compilation problem. The change is in next
patches.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
---

vanilla-linux-2.6.9-paolo/arch/um/kernel/process.c | 13 -------------
1 files changed, 13 deletions(-)

diff -puN arch/um/kernel/process.c~uml-revert-wrong-build-fix arch/um/kernel/process.c
--- vanilla-linux-2.6.9/arch/um/kernel/process.c~uml-revert-wrong-build-fix 2004-11-03 23:45:15.493083424 +0100
+++ vanilla-linux-2.6.9-paolo/arch/um/kernel/process.c 2004-11-03 23:45:15.496082968 +0100
@@ -202,11 +202,6 @@ __uml_setup("nosysemu", nosysemu_cmd_par
" To make it working, you need a kernel patch for your host, too.\n"
" See http://perso.wanadoo.fr/laurent.vivier/UML/ for further information.\n");

-/* Ugly hack for now... --cw */
-#ifndef PTRACE_SYSEMU
-#define PTRACE_SYSEMU 31
-#endif
-
static void __init check_sysemu(void)
{
void *stack;
@@ -216,9 +211,7 @@ static void __init check_sysemu(void)
return;

printk("Checking syscall emulation patch for ptrace...");
-#ifdef CONFIG_MODE_SKAS
sysemu_supported = 0;
-#endif /* CONFIG_MODE_SKAS */
pid = start_ptraced_child(&stack);
if(ptrace(PTRACE_SYSEMU, pid, 0, 0) >= 0) {
struct user_regs_struct regs;
@@ -240,23 +233,17 @@ static void __init check_sysemu(void)

stop_ptraced_child(pid, stack, 0);

-#ifdef CONFIG_MODE_SKAS
sysemu_supported = 1;
-#endif /* CONFIG_MODE_SKAS */
printk("found\n");
}
else
{
stop_ptraced_child(pid, stack, 1);
-#ifdef CONFIG_MODE_SKAS
sysemu_supported = 0;
-#endif /* CONFIG_MODE_SKAS */
printk("missing\n");
}

-#ifdef CONFIG_MODE_SKAS
set_using_sysemu(!force_sysemu_disabled);
-#endif
}

void __init check_ptrace(void)
_