[PATCH 2.6.14-rc5-mm1] UML: fix compile part-1

From: Miklos Szeredi
Date: Mon Oct 24 2005 - 10:55:28 EST


This patch fixes the following compile error:

CC arch/um/kernel/syscall_kern.o
In file included from arch/um/kernel/syscall_kern.c:22:
arch/um/include/sysdep/syscalls.h:14: error: conflicting types for `sys_ptrace'
include/linux/syscalls.h:494: error: previous declaration of `sys_ptrace'

Don't know if it's the correct fix, but result seems to work fine for
me.

Signed-off-by: Miklos Szeredi <miklos@xxxxxxxxxx>

---
Index: linux/arch/um/include/sysdep/syscalls.h
===================================================================
--- linux.orig/arch/um/include/sysdep/syscalls.h 2005-10-04 14:18:29.000000000 +0200
+++ linux/arch/um/include/sysdep/syscalls.h 2005-10-04 14:19:07.000000000 +0200
@@ -11,7 +11,6 @@ typedef long syscall_handler_t(struct pt
/* Not declared on x86, incompatible declarations on x86_64, so these have
* to go here rather than in sys_call_table.c
*/
-extern syscall_handler_t sys_ptrace;
extern syscall_handler_t sys_rt_sigaction;

extern syscall_handler_t old_mmap_i386;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/