Commit 974789a5 authored by Paolo \'Blaisorblade\' Giarrusso's avatar Paolo \'Blaisorblade\' Giarrusso Committed by Linus Torvalds

[PATCH] 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: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 452d3ad9
...@@ -202,11 +202,6 @@ __uml_setup("nosysemu", nosysemu_cmd_param, ...@@ -202,11 +202,6 @@ __uml_setup("nosysemu", nosysemu_cmd_param,
" To make it working, you need a kernel patch for your host, too.\n" " 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"); " 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) static void __init check_sysemu(void)
{ {
void *stack; void *stack;
...@@ -216,9 +211,7 @@ static void __init check_sysemu(void) ...@@ -216,9 +211,7 @@ static void __init check_sysemu(void)
return; return;
printk("Checking syscall emulation patch for ptrace..."); printk("Checking syscall emulation patch for ptrace...");
#ifdef CONFIG_MODE_SKAS
sysemu_supported = 0; sysemu_supported = 0;
#endif /* CONFIG_MODE_SKAS */
pid = start_ptraced_child(&stack); pid = start_ptraced_child(&stack);
if(ptrace(PTRACE_SYSEMU, pid, 0, 0) >= 0) { if(ptrace(PTRACE_SYSEMU, pid, 0, 0) >= 0) {
struct user_regs_struct regs; struct user_regs_struct regs;
...@@ -240,23 +233,17 @@ static void __init check_sysemu(void) ...@@ -240,23 +233,17 @@ static void __init check_sysemu(void)
stop_ptraced_child(pid, stack, 0); stop_ptraced_child(pid, stack, 0);
#ifdef CONFIG_MODE_SKAS
sysemu_supported = 1; sysemu_supported = 1;
#endif /* CONFIG_MODE_SKAS */
printk("found\n"); printk("found\n");
} }
else else
{ {
stop_ptraced_child(pid, stack, 1); stop_ptraced_child(pid, stack, 1);
#ifdef CONFIG_MODE_SKAS
sysemu_supported = 0; sysemu_supported = 0;
#endif /* CONFIG_MODE_SKAS */
printk("missing\n"); printk("missing\n");
} }
#ifdef CONFIG_MODE_SKAS
set_using_sysemu(!force_sysemu_disabled); set_using_sysemu(!force_sysemu_disabled);
#endif
} }
void __init check_ptrace(void) void __init check_ptrace(void)
......
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