X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-settle.c;h=3b26f10d5035f815148118e1db36d93637d49d34;hp=1c3c28176b98fcea62f9e3a723ae9fb02f3e37e0;hb=619b97ff2b9e29c79dedd9aff425c7a11764c300;hpb=e3196993f1f7fdd9fb7fbf4eeb397080554ae920

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 1c3c28176..3b26f10d5 100644
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -36,9 +36,9 @@
 #define DEFAULT_TIMEOUT			180
 #define LOOP_PER_SECOND			20
 
-static int volatile is_timeout;
+static volatile sig_atomic_t is_timeout;
 
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
 {
 	switch (signum) {
 		case SIGALRM:
@@ -70,7 +70,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 
 	/* set signal handlers */
 	memset(&act, 0x00, sizeof(act));
-	act.sa_handler = (void (*)(int)) sig_handler;
+	act.sa_handler = sig_handler;
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = 0;
 	sigaction(SIGALRM, &act, NULL);