projects/linux·commit bc6c8364

uml: fix compile error in deliver_alarm()

bc6c8364 · Miklos Szeredi <[email protected]> · 2012-09-05 18:38:50 +02:00

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 <[email protected]>
CC: Martin Pärtel <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
bc6c83641e1df61cff67748987f95ca62953565e
Parents
8a55ade7

Changes

1 files changed · +1 −1

FileStatusAddDelContent
arch/um/os-Linux/time.cmodified+1−1View file

arch/um/os-Linux/time.c

View file
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index f602385..0748fe0 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;
}