ia64/xen-unstable

changeset 18808:9958ef441af0

x86: Fix the clocksource= boot parameter after c/s 18786.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Nov 19 12:40:23 2008 +0000 (2008-11-19)
parents f09a1d5d4338
children 876bffced2b8
files xen/arch/x86/time.c
line diff
     1.1 --- a/xen/arch/x86/time.c	Tue Nov 18 15:59:26 2008 +0000
     1.2 +++ b/xen/arch/x86/time.c	Wed Nov 19 12:40:23 2008 +0000
     1.3 @@ -56,6 +56,7 @@ struct cpu_time {
     1.4  };
     1.5  
     1.6  struct platform_timesource {
     1.7 +    char *id;
     1.8      char *name;
     1.9      u64 frequency;
    1.10      u64 (*read_counter)(void);
    1.11 @@ -370,6 +371,7 @@ static int init_pit(struct platform_time
    1.12  
    1.13  static struct platform_timesource plt_pit =
    1.14  {
    1.15 +    .id = "pit",
    1.16      .name = "PIT",
    1.17      .frequency = CLOCK_TICK_RATE,
    1.18      .read_counter = read_pit_count,
    1.19 @@ -407,6 +409,7 @@ static void resume_hpet(struct platform_
    1.20  
    1.21  static struct platform_timesource plt_hpet =
    1.22  {
    1.23 +    .id = "hpet",
    1.24      .name = "HPET",
    1.25      .read_counter = read_hpet_count,
    1.26      .counter_bits = 32,
    1.27 @@ -471,6 +474,7 @@ static int init_cyclone(struct platform_
    1.28  
    1.29  static struct platform_timesource plt_cyclone =
    1.30  {
    1.31 +    .id = "cyclone",
    1.32      .name = "IBM Cyclone",
    1.33      .frequency = CYCLONE_TIMER_FREQ,
    1.34      .read_counter = read_cyclone_count,
    1.35 @@ -502,6 +506,7 @@ static int init_pmtimer(struct platform_
    1.36  
    1.37  static struct platform_timesource plt_pmtimer =
    1.38  {
    1.39 +    .id = "acpi",
    1.40      .name = "ACPI PM Timer",
    1.41      .frequency = ACPI_PM_FREQUENCY,
    1.42      .read_counter = read_pmtimer_count,
    1.43 @@ -599,7 +604,7 @@ static void init_platform_timer(void)
    1.44          for ( i = 0; i < ARRAY_SIZE(plt_timers); i++ )
    1.45          {
    1.46              pts = plt_timers[i];
    1.47 -            if ( !strcmp(opt_clocksource, pts->name) )
    1.48 +            if ( !strcmp(opt_clocksource, pts->id) )
    1.49              {
    1.50                  rc = pts->init(pts);
    1.51                  break;