Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Miklos Szeredi and committed by
Linus Torvalds
bc6c8364 8a55ade7

+1 -1
+1 -1
arch/um/os-Linux/time.c
··· 114 114 skew += this_tick - last_tick; 115 115 116 116 while (skew >= one_tick) { 117 - alarm_handler(SIGVTALRM, NULL); 117 + alarm_handler(SIGVTALRM, NULL, NULL); 118 118 skew -= one_tick; 119 119 } 120 120