Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 872aaa65 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[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: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e64bd134

arch/um/kernel/time_kern.c

+4 −16
Original line number Diff line number Diff line
@@ -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;

#endif

	}

	else {

		prev_nsecs = os_nsecs();

		first_tick = 1;

	}



	while(ticks > 0){

		do_IRQ(TIMER_IRQ, regs);

		ticks--;