# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1227098423 0
# Node ID 9958ef441af035913f5c595350c5dfe1196f206b
# Parent f09a1d5d4338eab9c593b63b8ae89ddf481a3681
x86: Fix the clocksource= boot parameter after c/s 18786.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
xen/arch/x86/time.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)
diff -r f09a1d5d4338 -r 9958ef441af0 xen/arch/x86/time.c
--- a/xen/arch/x86/time.c Tue Nov 18 15:59:26 2008 +0000
+++ b/xen/arch/x86/time.c Wed Nov 19 12:40:23 2008 +0000
@@ -56,6 +56,7 @@ struct cpu_time {
};
struct platform_timesource {
+ char *id;
char *name;
u64 frequency;
u64 (*read_counter)(void);
@@ -370,6 +371,7 @@ static int init_pit(struct platform_time
static struct platform_timesource plt_pit =
{
+ .id = "pit",
.name = "PIT",
.frequency = CLOCK_TICK_RATE,
.read_counter = read_pit_count,
@@ -407,6 +409,7 @@ static void resume_hpet(struct platform_
static struct platform_timesource plt_hpet =
{
+ .id = "hpet",
.name = "HPET",
.read_counter = read_hpet_count,
.counter_bits = 32,
@@ -471,6 +474,7 @@ static int init_cyclone(struct platform_
static struct platform_timesource plt_cyclone =
{
+ .id = "cyclone",
.name = "IBM Cyclone",
.frequency = CYCLONE_TIMER_FREQ,
.read_counter = read_cyclone_count,
@@ -502,6 +506,7 @@ static int init_pmtimer(struct platform_
static struct platform_timesource plt_pmtimer =
{
+ .id = "acpi",
.name = "ACPI PM Timer",
.frequency = ACPI_PM_FREQUENCY,
.read_counter = read_pmtimer_count,
@@ -599,7 +604,7 @@ static void init_platform_timer(void)
for ( i = 0; i < ARRAY_SIZE(plt_timers); i++ )
{
pts = plt_timers[i];
- if ( !strcmp(opt_clocksource, pts->name) )
+ if ( !strcmp(opt_clocksource, pts->id) )
{
rc = pts->init(pts);
break;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home