diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2012-09-05 18:38:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-05 19:40:59 -0700 |
| commit | bc6c83641e1df61cff67748987f95ca62953565e (patch) | |
| tree | a779a0e75900c97176555d313168a93de4ca5661 | |
| parent | 8a55ade76551e3927b4e41ee9e7751875d18bc25 (diff) | |
| download | blackbird-op-linux-bc6c83641e1df61cff67748987f95ca62953565e.tar.gz blackbird-op-linux-bc6c83641e1df61cff67748987f95ca62953565e.zip | |
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>
| -rw-r--r-- | arch/um/os-Linux/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c index f60238559af3..0748fe0c8a73 100644 --- a/arch/um/os-Linux/time.c +++ b/arch/um/os-Linux/time.c @@ -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; } |
