2005-03-07 18:15:20

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 14/16] UML - Fix a compile failure

Remove a UML/x86_64 warning (and build failure if CONFIG_MODE_TT is disabled).

Signed-off-by: Jeff Dike <[email protected]>

Index: linux-2.6.11/arch/um/sys-x86_64/ptrace_user.c
===================================================================
--- linux-2.6.11.orig/arch/um/sys-x86_64/ptrace_user.c 2005-03-05 12:07:33.000000000 -0500
+++ linux-2.6.11/arch/um/sys-x86_64/ptrace_user.c 2005-03-05 12:23:46.000000000 -0500
@@ -42,23 +42,12 @@
void arch_leave_kernel(void *task, int pid)
{
#ifdef UM_USER_CS
- if(ptrace(PTRACE_POKEUSER, pid, CS, UM_USER_CS) < 0)
- tracer_panic("POKEUSER CS failed");
+ if(ptrace(PTRACE_POKEUSER, pid, CS, UM_USER_CS) < 0)
+ printk("POKEUSR CS failed");
#endif

- if(ptrace(PTRACE_POKEUSER, pid, DS, __USER_DS) < 0)
- tracer_panic("POKEUSER DS failed");
- if(ptrace(PTRACE_POKEUSER, pid, ES, __USER_DS) < 0)
- tracer_panic("POKEUSER ES failed");
+ if(ptrace(PTRACE_POKEUSER, pid, DS, __USER_DS) < 0)
+ printk("POKEUSR DS failed");
+ if(ptrace(PTRACE_POKEUSER, pid, ES, __USER_DS) < 0)
+ printk("POKEUSR ES failed");
}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only. This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */