hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Jeff Dike 2006-07-10 04:45:08 -07:00 committed by Linus Torvalds
parent e64bd13408
commit 872aaa65a6
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/um/kernel/time_kern.c
View File

@ -38,7 +38,6 @@ unsigned long long sched_clock(void)
/* Changed at early boot */ /* Changed at early boot */
int timer_irq_inited = 0; int timer_irq_inited = 0;
static int first_tick;
static unsigned long long prev_nsecs; static unsigned long long prev_nsecs;
#ifdef CONFIG_UML_REAL_TIME_CLOCK #ifdef CONFIG_UML_REAL_TIME_CLOCK
static long long delta; /* Deviation per interval */ static long long delta; /* Deviation per interval */
@ -48,15 +47,8 @@ void timer_irq(union uml_pt_regs *regs)
{ {
unsigned long long ticks = 0; 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 #ifdef CONFIG_UML_REAL_TIME_CLOCK
if(prev_nsecs){
/* We've had 1 tick */ /* We've had 1 tick */
unsigned long long nsecs = os_nsecs(); unsigned long long nsecs = os_nsecs();
@ -69,15 +61,11 @@ void timer_irq(union uml_pt_regs *regs)
ticks += (delta * HZ) / BILLION; ticks += (delta * HZ) / BILLION;
delta -= (ticks * BILLION) / HZ; delta -= (ticks * BILLION) / HZ;
}
else prev_nsecs = os_nsecs();
#else #else
ticks = 1; ticks = 1;
#endif #endif
}
else {
prev_nsecs = os_nsecs();
first_tick = 1;
}
while(ticks > 0){ while(ticks > 0){
do_IRQ(TIMER_IRQ, regs); do_IRQ(TIMER_IRQ, regs);
ticks--; ticks--;