From: Jeff Dike timer_irq_inited was useless, so it is removed. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton --- arch/um/include/kern_util.h | 1 - arch/um/kernel/time.c | 5 ----- arch/um/os-Linux/signal.c | 7 ------- 3 files changed, 13 deletions(-) diff -puN arch/um/include/kern_util.h~uml-remove-unused-variable arch/um/include/kern_util.h --- a/arch/um/include/kern_util.h~uml-remove-unused-variable +++ a/arch/um/include/kern_util.h @@ -27,7 +27,6 @@ extern int ncpus; extern char *linux_prog; extern char *gdb_init; extern int kmalloc_ok; -extern int timer_irq_inited; extern int jail; extern int nsyscalls; diff -puN arch/um/kernel/time.c~uml-remove-unused-variable arch/um/kernel/time.c --- a/arch/um/kernel/time.c~uml-remove-unused-variable +++ a/arch/um/kernel/time.c @@ -35,9 +35,6 @@ unsigned long long sched_clock(void) return (unsigned long long)jiffies_64 * (1000000000 / HZ); } -/* Changed at early boot */ -int timer_irq_inited = 0; - static unsigned long long prev_nsecs; #ifdef CONFIG_UML_REAL_TIME_CLOCK static long long delta; /* Deviation per interval */ @@ -116,8 +113,6 @@ static void register_timer(void) printk(KERN_ERR "register_timer : request_irq failed - " "errno = %d\n", -err); - timer_irq_inited = 1; - err = set_interval(1); if(err != 0) printk(KERN_ERR "register_timer : set_interval failed - " diff -puN arch/um/os-Linux/signal.c~uml-remove-unused-variable arch/um/os-Linux/signal.c --- a/arch/um/os-Linux/signal.c~uml-remove-unused-variable +++ a/arch/um/os-Linux/signal.c @@ -55,15 +55,8 @@ void sig_handler(int sig, struct sigcont set_signals(enabled); } -extern int timer_irq_inited; - static void real_alarm_handler(int sig, struct sigcontext *sc) { - if(!timer_irq_inited){ - signals_enabled = 1; - return; - } - if(sig == SIGALRM) switch_timers(0); _