picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove asmlinkage

Browse source
This commit is contained in:
Kay Sievers 2009-05-05 02:39:16 +02:00
parent e3196993f1
commit 619b97ff2b
5 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
udev/test-udev.c
View file

@ -30,14 +30,14 @@
#include "udev.h"
static void asmlinkage sig_handler(int signum)
static void sig_handler(int signum)
{
switch (signum) {
case SIGALRM:
exit(1);
_exit(1);
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));
act.sa_handler = (void (*)(int)) sig_handler;
act.sa_handler = sig_handler;
sigemptyset (&act.sa_mask);
act.sa_flags = 0;
sigaction(SIGALRM, &act, NULL);

8
udev/udev-sysdeps.h
View file

@ -23,14 +23,6 @@
#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)
{

4
udev/udevadm-monitor.c
View file

@ -35,7 +35,7 @@
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;
@ -135,7 +135,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
/* 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);

6
udev/udevadm-settle.c
View file

@ -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);

18
udev/udevd.c
View file

@ -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 volatile int sigchilds_waiting;
static volatile int udev_exit;
static volatile int reload_config;
static volatile int 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;
@ -172,10 +172,10 @@ static void event_queue_delete(struct udev_event *event)
udev_event_unref(event);
}
static void asmlinkage event_sig_handler(int signum)
static void event_sig_handler(int signum)
{
if (signum == SIGALRM)
exit(1);
_exit(1);
}
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));
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);
@ -570,7 +570,7 @@ static int handle_inotify(struct udev *udev)
return 0;
}
static void asmlinkage sig_handler(int signum)
static void sig_handler(int signum)
{
switch (signum) {
case SIGINT:
@ -894,7 +894,7 @@ int main(int argc, char *argv[])
/* 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);