Move timer signal initialization from init_irq_signals to a new function, timer_init.
Signed-off-by: Jeff Dike <[EMAIL PROTECTED]> --- arch/um/include/os.h | 1 + arch/um/kernel/time.c | 2 ++ arch/um/os-Linux/irq.c | 4 ---- arch/um/os-Linux/signal.c | 10 ++++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) Index: linux-2.6.20/arch/um/kernel/time.c =================================================================== --- linux-2.6.20.orig/arch/um/kernel/time.c 2007-09-19 12:25:05.000000000 -0400 +++ linux-2.6.20/arch/um/kernel/time.c 2007-09-19 12:25:06.000000000 -0400 @@ -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 - " Index: linux-2.6.20/arch/um/os-Linux/irq.c =================================================================== --- linux-2.6.20.orig/arch/um/os-Linux/irq.c 2007-09-19 12:24:52.000000000 -0400 +++ linux-2.6.20/arch/um/os-Linux/irq.c 2007-09-19 12:25:06.000000000 -0400 @@ -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); Index: linux-2.6.20/arch/um/include/os.h =================================================================== --- linux-2.6.20.orig/arch/um/include/os.h 2007-09-19 12:25:05.000000000 -0400 +++ linux-2.6.20/arch/um/include/os.h 2007-09-19 12:25:06.000000000 -0400 @@ -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, ...); Index: linux-2.6.20/arch/um/os-Linux/signal.c =================================================================== --- linux-2.6.20.orig/arch/um/os-Linux/signal.c 2007-09-19 12:25:05.000000000 -0400 +++ linux-2.6.20/arch/um/os-Linux/signal.c 2007-09-19 12:25:06.000000000 -0400 @@ -85,6 +85,16 @@ void alarm_handler(int sig, struct sigco 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, - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/