diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 01:27:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:08 -0700 |
| commit | 78a26e25ce4837a03ac3b6c32cdae1958e547639 (patch) | |
| tree | d50a46a1af87f62781c2eb781cd7e20cea20e5ff /arch/um | |
| parent | a2f018bf389422a55f1455ab8b9b5eedc5ea1803 (diff) | |
| download | talos-obmc-linux-78a26e25ce4837a03ac3b6c32cdae1958e547639.tar.gz talos-obmc-linux-78a26e25ce4837a03ac3b6c32cdae1958e547639.zip | |
uml: separate timer initialization
Move timer signal initialization from init_irq_signals to a new function,
timer_init.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/os.h | 1 | ||||
| -rw-r--r-- | arch/um/kernel/time.c | 2 | ||||
| -rw-r--r-- | arch/um/os-Linux/irq.c | 4 | ||||
| -rw-r--r-- | arch/um/os-Linux/signal.c | 10 |
4 files changed, 13 insertions, 4 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 1897785fd571..a6d80721d3c4 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h @@ -227,6 +227,7 @@ extern int set_umid(char *name); extern char *get_umid(void); /* signal.c */ +extern void timer_init(void); extern void set_sigstack(void *sig_stack, int size); extern void remove_sigstack(void); extern void set_handler(int sig, void (*handler)(int), int flags, ...); diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 2bda07dcd345..758d4f9cb22a 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -97,6 +97,8 @@ static void register_timer(void) { int err; + timer_init(); + err = request_irq(TIMER_IRQ, um_timer, IRQF_DISABLED, "timer", NULL); if (err != 0) printk(KERN_ERR "register_timer : request_irq failed - " diff --git a/arch/um/os-Linux/irq.c b/arch/um/os-Linux/irq.c index a633fa8e0a94..2fe482219b6b 100644 --- a/arch/um/os-Linux/irq.c +++ b/arch/um/os-Linux/irq.c @@ -145,10 +145,6 @@ void init_irq_signals(int on_sigstack) flags = on_sigstack ? SA_ONSTACK : 0; - set_handler(SIGVTALRM, (__sighandler_t) alarm_handler, - flags | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, -1); - set_handler(SIGALRM, (__sighandler_t) alarm_handler, - flags | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, -1); set_handler(SIGIO, (__sighandler_t) sig_handler, flags | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1); signal(SIGWINCH, SIG_IGN); diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index 1c5267ec13b0..53593c8b9c34 100644 --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c @@ -85,6 +85,16 @@ void alarm_handler(int sig, struct sigcontext *sc) set_signals(enabled); } +void timer_init(void) +{ + set_handler(SIGVTALRM, (__sighandler_t) alarm_handler, + SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, + SIGALRM, -1); + set_handler(SIGALRM, (__sighandler_t) alarm_handler, + SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, + SIGALRM, -1); +} + void set_sigstack(void *sig_stack, int size) { stack_t stack = ((stack_t) { .ss_flags = 0, |
