From: Nix <nix@esperi.org.uk>
To: Jeff Dike <jdike@addtoit.com>
Cc: Andrew Morton <akpm@osdl.org>,
LKML <linux-kernel@vger.kernel.org>,
uml-devel <user-mode-linux-devel@lists.sourceforge.net>
Subject: Re: [PATCH 11/19] UML - Track and make up lost ticks
Date: Tue, 29 Apr 2008 19:54:02 +0100 [thread overview]
Message-ID: <877iegcx11.fsf@hades.wkstn.nix> (raw)
In-Reply-To: <20080425175613.GA11192@c2.user-mode-linux.org> (Jeff Dike's message of "Fri, 25 Apr 2008 13:56:13 -0400")
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
next prev parent reply other threads:[~2008-04-29 19:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-25 17:56 [PATCH 11/19] UML - Track and make up lost ticks Jeff Dike
2008-04-29 18:54 ` Nix [this message]
2008-04-29 20:29 ` Jeff Dike
2008-05-06 20:46 ` Andrew Morton
2008-05-06 21:44 ` [uml-devel] " Jeff Dike
2008-05-06 22:01 ` Andrew Morton
2008-05-06 23:54 ` Nix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877iegcx11.fsf@hades.wkstn.nix \
--to=nix@esperi.org.uk \
--cc=akpm@osdl.org \
--cc=jdike@addtoit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox