Re: [uml-devel] [PATCH 11/19] UML - Track and make up lost ticks

[Jeff Dike <jdike@addtoit.com>]

On Tue, Apr 29, 2008 at 07:54:02PM +0100, Nix wrote:
> On 25 Apr 2008, Jeff Dike stated, in part:
> > Index: linux-2.6-git/arch/um/os-Linux/time.c
> > ===================================================================
> > --- linux-2.6-git.orig/arch/um/os-Linux/time.c	2008-04-25 10:42:12.000000000 -0400
> > +++ linux-2.6-git/arch/um/os-Linux/time.c	2008-04-25 11:19:26.000000000 -0400
> > +	alarm_handler(SIGVTALRM, NULL);
> > +		alarm_handler(SIGVTALRM, NULL);
> > -extern void alarm_handler(int sig, struct sigcontext *sc);
> > -		alarm_handler(SIGVTALRM, NULL);
> 
> Yet, in arch/um/include/process.h, we see, unchanged since the year dot, the
> obviously wrong prototype:
> 
> extern void alarm_handler(int sig, struct sigcontext sc);
> 
> Hence:
> 
>   CC      arch/um/os-Linux/time.o
> arch/um/os-Linux/time.c: In function ‘deliver_alarm’:
> arch/um/os-Linux/time.c:119: error: incompatible type for argument 2 of ‘alarm_handler’
> make[1]: *** [arch/um/os-Linux/time.o] Error 1
> make: *** [arch/um/os-Linux] Error 2
> 
> Fix trivial:
> 
> Signed-off-by: Nick Alcock <nix@esperi.org.uk>
> -- 
> Index: linux/arch/um/include/process.h
> ===================================================================
> --- linux.orig/arch/um/include/process.h	2006-07-09 14:19:52.000000000 +0100
> +++ linux/arch/um/include/process.h	2008-04-29 19:49:49.000000000 +0100
> @@ -8,8 +8,8 @@
>  
>  #include <signal.h>
>  
> -extern void sig_handler(int sig, struct sigcontext sc);
> -extern void alarm_handler(int sig, struct sigcontext sc);
> +extern void sig_handler(int sig, struct sigcontext *sc);
> +extern void alarm_handler(int sig, struct sigcontext *sc);
>  
>  #endif

Crap, I fixed that, but forgot to quilt add it, I guess.

ACK.

			Jeff

-- 
Work email - jdike at linux dot intel dot com

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel