Skip to content

Commit

Permalink
uml: fix compile error in deliver_alarm()
Browse files Browse the repository at this point in the history
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 d3c1cfc ("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>
  • Loading branch information
Miklos Szeredi authored and Linus Torvalds committed Sep 6, 2012
1 parent 8a55ade commit bc6c836
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/um/os-Linux/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit bc6c836

Please sign in to comment.