chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
delete libvolume_id
[elogind.git]
/
udev
/
udevadm-settle.c
diff --git
a/udev/udevadm-settle.c
b/udev/udevadm-settle.c
index 1c3c28176b98fcea62f9e3a723ae9fb02f3e37e0..3b26f10d5035f815148118e1db36d93637d49d34 100644
(file)
--- a/
udev/udevadm-settle.c
+++ b/
udev/udevadm-settle.c
@@
-36,9
+36,9
@@
#define DEFAULT_TIMEOUT 180
#define LOOP_PER_SECOND 20
#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:
{
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));
/* 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);
sigemptyset (&act.sa_mask);
act.sa_flags = 0;
sigaction(SIGALRM, &act, NULL);