linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] uml: fix compile error in deliver_alarm()
@ 2012-09-05 16:38 Miklos Szeredi
  0 siblings, 0 replies; only message in thread
From: Miklos Szeredi @ 2012-09-05 16:38 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, user-mode-linux-devel, Martin Pärtel

From: Miklos Szeredi <mszeredi@suse.cz>

Fix the following compile error on UML.

arch/um/os-Linux/time.c: In function 'deliver_alarm':
arch/um/os-Linux/time.c:117:3: error: too few arguments to function 'alarm_handler'
arch/um/os-Linux/internal.h:1:6: note: declared here

The error was introduced by commit d3c1cfcd (um: pass siginfo to guest
process) in 3.6-rc1.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: Martin Pärtel <martin.partel@gmail.com>
---
 arch/um/os-Linux/time.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/um/os-Linux/time.c
===================================================================
--- linux-2.6.orig/arch/um/os-Linux/time.c	2012-09-05 17:18:27.000000000 +0200
+++ linux-2.6/arch/um/os-Linux/time.c	2012-09-05 18:34:35.000000000 +0200
@@ -114,7 +114,7 @@ static void deliver_alarm(void)
 	skew += this_tick - last_tick;
 
 	while (skew >= one_tick) {
-		alarm_handler(SIGVTALRM, NULL);
+		alarm_handler(SIGVTALRM, NULL, NULL);
 		skew -= one_tick;
 	}
 

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2012-09-05 16:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-05 16:38 [PATCH] uml: fix compile error in deliver_alarm() Miklos Szeredi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).