[PATCH] uml: timer handler tidying

Get rid of a user of timer_irq_inited (and first_tick) by observing that
prev_ticks can be used to decide if this is the first call.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c
index 8e56c58320ba19b79020cff4b0643386b602ceb3..552ca1cb9847d854ed9ba704cbd3b8cad56199aa 100644 (file)
--- a/arch/um/kernel/time_kern.c
+++ b/arch/um/kernel/time_kern.c
@@ -38,7 +38,6 @@ unsigned long long sched_clock(void)
 /* Changed at early boot */
 int timer_irq_inited = 0;
 
-static int first_tick;
 static unsigned long long prev_nsecs;
 #ifdef CONFIG_UML_REAL_TIME_CLOCK
 static long long delta;                /* Deviation per interval */
@@ -48,15 +47,8 @@ void timer_irq(union uml_pt_regs *regs)
 {
        unsigned long long ticks = 0;
 
-       if(!timer_irq_inited){
-               /* This is to ensure that ticks don't pile up when
-                * the timer handler is suspended */
-               first_tick = 0;
-               return;
-       }
-
-       if(first_tick){
 #ifdef CONFIG_UML_REAL_TIME_CLOCK
+       if(prev_nsecs){
                /* We've had 1 tick */
                unsigned long long nsecs = os_nsecs();
 
@@ -69,15 +61,11 @@ void timer_irq(union uml_pt_regs *regs)
 
                ticks += (delta * HZ) / BILLION;
                delta -= (ticks * BILLION) / HZ;
+       }
+       else prev_nsecs = os_nsecs();
 #else
-               ticks = 1;
+       ticks = 1;
 #endif
-       }
-       else {
-               prev_nsecs = os_nsecs();
-               first_tick = 1;
-       }
-
        while(ticks > 0){
                do_IRQ(TIMER_IRQ, regs);
                ticks--;