summaryrefslogtreecommitdiff
path: root/udev/udevadm-settle.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-05-05 02:39:16 +0200
committerKay Sievers <kay.sievers@vrfy.org>2009-05-05 02:39:16 +0200
commit619b97ff2b9e29c79dedd9aff425c7a11764c300 (patch)
tree0440449feab24a17772dc2bb9fad4265bba766bc /udev/udevadm-settle.c
parente3196993f1f7fdd9fb7fbf4eeb397080554ae920 (diff)
remove asmlinkage
Diffstat (limited to 'udev/udevadm-settle.c')
-rw-r--r--udev/udevadm-settle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 1c3c28176b..3b26f10d50 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);