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

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

[Miklos Szeredi]

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@szeredi.hu>

---
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;

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

[Jeff Dike]

On Mon, Oct 24, 2005 at 05:54:46PM +0200, Miklos Szeredi wrote:
> 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@szeredi.hu>

Acked-By: Jeff Dike <jdike@addtoit.com>

				Jeff

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

[Andrew Morton]

Miklos Szeredi <miklos@szeredi.hu> wrote:
>
> --- 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

The patch didn't apply - arch/um/include/sysdep is a symlink, so it has the
same problem as patches against include/asm/*.

You really weanted to patch arch/um/include/sysdep-i386/syscalls.h

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

[Blaisorblade]

On Tuesday 25 October 2005 00:35, Andrew Morton wrote:
> Miklos Szeredi <miklos@szeredi.hu> wrote:
> > --- 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
>
> The patch didn't apply - arch/um/include/sysdep is a symlink, so it has the
> same problem as patches against include/asm/*.
Using O= in the build helps avoiding this problems (beyond lots of other 
niceties).
> You really weanted to patch arch/um/include/sysdep-i386/syscalls.h
Yep.
-- 
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

	

	
		
___________________________________ 
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
http://mail.yahoo.it