Commit bc6c8364 authored Sep 05, 2012 by Miklos Szeredi Committed by Linus Torvalds Sep 05, 2012

uml: fix compile error in deliver_alarm()



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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8a55ade7

arch/um/os-Linux/time.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message