chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e319699
)
remove asmlinkage
author
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 5 May 2009 00:39:16 +0000
(
02:39
+0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 5 May 2009 00:39:16 +0000
(
02:39
+0200)
udev/test-udev.c
patch
|
blob
|
history
udev/udev-sysdeps.h
patch
|
blob
|
history
udev/udevadm-monitor.c
patch
|
blob
|
history
udev/udevadm-settle.c
patch
|
blob
|
history
udev/udevd.c
patch
|
blob
|
history
diff --git
a/udev/test-udev.c
b/udev/test-udev.c
index ff1c353e6649d0e21e9d43df0087d8c0c4375c99..6ec91c174a20202f86d8471c04f18bbf06b139fd 100644
(file)
--- a/
udev/test-udev.c
+++ b/
udev/test-udev.c
@@
-30,14
+30,14
@@
#include "udev.h"
#include "udev.h"
-static void
asmlinkage
sig_handler(int signum)
+static void sig_handler(int signum)
{
switch (signum) {
case SIGALRM:
{
switch (signum) {
case SIGALRM:
- exit(1);
+
_
exit(1);
case SIGINT:
case SIGTERM:
case SIGINT:
case SIGTERM:
- exit(20 + signum);
+
_
exit(20 + signum);
}
}
}
}
@@
-62,7
+62,7
@@
int main(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);
diff --git
a/udev/udev-sysdeps.h
b/udev/udev-sysdeps.h
index e20ea48a2f9f363da296321366f50eff15085e20..35671baca1e290b637e99271dc233c98aa497704 100644
(file)
--- a/
udev/udev-sysdeps.h
+++ b/
udev/udev-sysdeps.h
@@
-23,14
+23,6
@@
#include <stdint.h>
#include <errno.h>
#include <stdint.h>
#include <errno.h>
-/* needed for our signal handlers to work */
-#undef asmlinkage
-#ifdef __i386__
-#define asmlinkage __attribute__((regparm(0)))
-#else
-#define asmlinkage
-#endif /* __i386__ */
-
#ifndef HAVE_INOTIFY
static inline int inotify_init(void)
{
#ifndef HAVE_INOTIFY
static inline int inotify_init(void)
{
diff --git
a/udev/udevadm-monitor.c
b/udev/udevadm-monitor.c
index 27520f70614f90d25076d0452790d26a2c3777b0..3f4cb5772da316d7b9f5a2cefd67fb8279ac7a4d 100644
(file)
--- a/
udev/udevadm-monitor.c
+++ b/
udev/udevadm-monitor.c
@@
-35,7
+35,7
@@
static int udev_exit;
static int udev_exit;
-static void
asmlinkage
sig_handler(int signum)
+static void sig_handler(int signum)
{
if (signum == SIGINT || signum == SIGTERM)
udev_exit = 1;
{
if (signum == SIGINT || signum == SIGTERM)
udev_exit = 1;
@@
-135,7
+135,7
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
/* set signal handlers */
memset(&act, 0x00, sizeof(struct sigaction));
/* set signal handlers */
memset(&act, 0x00, sizeof(struct sigaction));
- act.sa_handler =
(void (*)(int))
sig_handler;
+ act.sa_handler = sig_handler;
sigemptyset(&act.sa_mask);
act.sa_flags = SA_RESTART;
sigaction(SIGINT, &act, NULL);
sigemptyset(&act.sa_mask);
act.sa_flags = SA_RESTART;
sigaction(SIGINT, &act, NULL);
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);
diff --git
a/udev/udevd.c
b/udev/udevd.c
index ec6ee009cd39158a80a294a25a240e227bf02e62..419c486ddd4fca09a341fb5d551337090c7e95ce 100644
(file)
--- a/
udev/udevd.c
+++ b/
udev/udevd.c
@@
-67,10
+67,10
@@
static int debug_trace;
static struct udev_rules *rules;
static struct udev_ctrl *udev_ctrl;
static struct udev_monitor *kernel_monitor;
static struct udev_rules *rules;
static struct udev_ctrl *udev_ctrl;
static struct udev_monitor *kernel_monitor;
-static volatile
in
t sigchilds_waiting;
-static volatile
in
t udev_exit;
-static volatile
in
t reload_config;
-static volatile
in
t signal_received;
+static volatile
sig_atomic_
t sigchilds_waiting;
+static volatile
sig_atomic_
t udev_exit;
+static volatile
sig_atomic_
t reload_config;
+static volatile
sig_atomic_
t signal_received;
static volatile pid_t settle_pid;
static int run_exec_q;
static int stop_exec_q;
static volatile pid_t settle_pid;
static int run_exec_q;
static int stop_exec_q;
@@
-172,10
+172,10
@@
static void event_queue_delete(struct udev_event *event)
udev_event_unref(event);
}
udev_event_unref(event);
}
-static void
asmlinkage
event_sig_handler(int signum)
+static void event_sig_handler(int signum)
{
if (signum == SIGALRM)
{
if (signum == SIGALRM)
- exit(1);
+
_
exit(1);
}
static void event_fork(struct udev_event *event)
}
static void event_fork(struct udev_event *event)
@@
-202,7
+202,7
@@
static void event_fork(struct udev_event *event)
/* set signal handlers */
memset(&act, 0x00, sizeof(act));
/* set signal handlers */
memset(&act, 0x00, sizeof(act));
- act.sa_handler =
(void (*)(int))
event_sig_handler;
+ act.sa_handler = event_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);
@@
-570,7
+570,7
@@
static int handle_inotify(struct udev *udev)
return 0;
}
return 0;
}
-static void
asmlinkage
sig_handler(int signum)
+static void sig_handler(int signum)
{
switch (signum) {
case SIGINT:
{
switch (signum) {
case SIGINT:
@@
-894,7
+894,7
@@
int main(int argc, char *argv[])
/* set signal handlers */
memset(&act, 0x00, sizeof(struct sigaction));
/* set signal handlers */
memset(&act, 0x00, sizeof(struct sigaction));
- act.sa_handler =
(void (*)(int))
sig_handler;
+ act.sa_handler = sig_handler;
sigemptyset(&act.sa_mask);
act.sa_flags = SA_RESTART;
sigaction(SIGINT, &act, NULL);
sigemptyset(&act.sa_mask);
act.sa_flags = SA_RESTART;
sigaction(SIGINT, &act, NULL);