redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] hpet: use read_timer_tsc only when CPU has TSC 

Only use read_timer_tsc only when CPU has TSC.  Thanks to Andrea for
pointing this out.  Should not be issue on any platforms as all recent
systems that has HPET also has CPUs that supports TSC.  The patch is still
required for correctness.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
hifive-unleashed-5.1
Venkatesh Pallipadi 2005-09-03 15:56:27 -07:00 committed by Linus Torvalds
parent 869f96a00e
commit 4116c527ea
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/i386/kernel/timers/timer_hpet.c
View File

@ -136,6 +136,8 @@ static void delay_hpet(unsigned long loops)
} while ((hpet_end - hpet_start) < (loops));
}
static struct timer_opts timer_hpet;
static int __init init_hpet(char* override)
{
unsigned long result, remain;
@ -163,6 +165,8 @@ static int __init init_hpet(char* override)
}
set_cyc2ns_scale(cpu_khz/1000);
}
/* set this only when cpu_has_tsc */
timer_hpet.read_timer = read_timer_tsc;
}
/*
@ -186,7 +190,6 @@ static struct timer_opts timer_hpet __read_mostly = {
.get_offset = get_offset_hpet,
.monotonic_clock = monotonic_clock_hpet,
.delay = delay_hpet,
.read_timer = read_timer_tsc,
};
struct init_timer_opts __initdata timer_hpet_init = {