ia64/xen-unstable

changeset 5921:501a70f3ae96

merge?
author cl349@firebug.cl.cam.ac.uk
date Thu Jul 28 12:34:45 2005 +0000 (2005-07-28)
parents e2d635617acd 80fed4ff19b2
children 577d1c7b47a9
files linux-2.6-xen-sparse/arch/xen/i386/kernel/irq.c linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.h linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c tools/xenstore/xenstored_domain.c xen/arch/x86/time.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/irq.c	Thu Jul 28 12:33:53 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/irq.c	Thu Jul 28 12:34:45 2005 +0000
     1.3 @@ -263,7 +263,6 @@ skip:
     1.4  void fixup_irqs(cpumask_t map)
     1.5  {
     1.6  	unsigned int irq;
     1.7 -	static int warned;
     1.8  
     1.9  	for (irq = 0; irq < NR_IRQS; irq++) {
    1.10  		cpumask_t mask;
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu Jul 28 12:33:53 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu Jul 28 12:34:45 2005 +0000
     2.3 @@ -1428,8 +1428,9 @@ int __init xlblk_init(void)
     2.4      int i;
     2.5  
     2.6  #ifdef CONFIG_XEN_BLKDEV_GRANT
     2.7 -    if ( 0 > gnttab_alloc_grant_references( MAXIMUM_OUTSTANDING_BLOCK_REQS,
     2.8 -                                            &gref_head, &gref_terminal ))
     2.9 +    /* A grant for every ring slot, plus one for the ring itself. */
    2.10 +    if ( 0 > gnttab_alloc_grant_references(MAXIMUM_OUTSTANDING_BLOCK_REQS + 1,
    2.11 +                                           &gref_head, &gref_terminal) )
    2.12          return 1;
    2.13      printk(KERN_ALERT "Blkif frontend is using grant tables.\n");
    2.14  #endif
     7.1 --- a/xen/arch/x86/time.c	Thu Jul 28 12:33:53 2005 +0000
     7.2 +++ b/xen/arch/x86/time.c	Thu Jul 28 12:34:45 2005 +0000
     7.3 @@ -233,6 +233,16 @@ void calibrate_tsc_ap(void)
     7.4      atomic_dec(&tsc_calibrate_gang);
     7.5  }
     7.6  
     7.7 +static char *freq_string(u64 freq)
     7.8 +{
     7.9 +    static char s[20];
    7.10 +    unsigned int x, y;
    7.11 +    y = (unsigned int)do_div(freq, 1000000) / 1000;
    7.12 +    x = (unsigned int)freq;
    7.13 +    sprintf(s, "%u.%03uMHz", x, y);
    7.14 +    return s;
    7.15 +}
    7.16 +
    7.17  /************************************************************
    7.18   * PLATFORM TIMER 1: PROGRAMMABLE INTERVAL TIMER (LEGACY PIT)
    7.19   */
    7.20 @@ -279,7 +289,7 @@ static int init_pit(void)
    7.21      platform_timer_stamp = pit_counter64;
    7.22      set_time_scale(&platform_timer_scale, CLOCK_TICK_RATE);
    7.23  
    7.24 -    printk("Platform timer is PIT\n");
    7.25 +    printk("Platform timer is %s PIT\n", freq_string(CLOCK_TICK_RATE));
    7.26  
    7.27      return 1;
    7.28  }
    7.29 @@ -319,12 +329,11 @@ static int init_hpet(void)
    7.30  
    7.31      if ( (hpet_address == 0) && opt_hpet_force )
    7.32      {
    7.33 -        printk(KERN_WARNING "WARNING: Enabling HPET base manually!\n");
    7.34          outl(0x800038a0, 0xcf8);
    7.35          outl(0xff000001, 0xcfc);
    7.36          outl(0x800038a0, 0xcf8);
    7.37          hpet_address = inl(0xcfc) & 0xfffffffe;
    7.38 -        printk(KERN_WARNING "WARNING: Enabled HPET at %#lx.\n", hpet_address);
    7.39 +        printk("WARNING: Forcibly enabled HPET at %#lx.\n", hpet_address);
    7.40      }
    7.41  
    7.42      if ( hpet_address == 0 )
    7.43 @@ -384,7 +393,7 @@ static int init_hpet(void)
    7.44      hpet_overflow(NULL);
    7.45      platform_timer_stamp = hpet_counter64;
    7.46  
    7.47 -    printk("Platform timer is HPET\n");
    7.48 +    printk("Platform timer is %s HPET\n", freq_string(hpet_rate));
    7.49  
    7.50      return 1;
    7.51  }
    7.52 @@ -465,7 +474,8 @@ static int init_cyclone(void)
    7.53      platform_timer_stamp = cyclone_counter64;
    7.54      set_time_scale(&platform_timer_scale, CYCLONE_TIMER_FREQ);
    7.55  
    7.56 -    printk("Platform timer is IBM Cyclone\n");
    7.57 +    printk("Platform timer is %s IBM Cyclone\n",
    7.58 +           freq_string(CYCLONE_TIMER_FREQ));
    7.59  
    7.60      return 1;
    7.61  }
    7.62 @@ -713,8 +723,9 @@ static void local_time_calibration(void 
    7.63  #if 0
    7.64      printk("PRE%d: tsc=%lld stime=%lld master=%lld\n",
    7.65             cpu, prev_tsc, prev_local_stime, prev_master_stime);
    7.66 -    printk("CUR%d: tsc=%lld stime=%lld master=%lld\n",
    7.67 -           cpu, curr_tsc, curr_local_stime, curr_master_stime);
    7.68 +    printk("CUR%d: tsc=%lld stime=%lld master=%lld -> %lld\n",
    7.69 +           cpu, curr_tsc, curr_local_stime, curr_master_stime,
    7.70 +           curr_master_stime - curr_local_stime);
    7.71  #endif
    7.72  
    7.73      /* Local time warps forward if it lags behind master time. */
    7.74 @@ -776,7 +787,8 @@ static void local_time_calibration(void 
    7.75          calibration_mul_frac = mul_frac(calibration_mul_frac, error_factor);
    7.76  
    7.77  #if 0
    7.78 -    printk("---%d: %08x %d\n", cpu, calibration_mul_frac, tsc_shift);
    7.79 +    printk("---%d: %08x %08x %d\n", cpu,
    7.80 +           error_factor, calibration_mul_frac, tsc_shift);
    7.81  #endif
    7.82  
    7.83      /* Record new timestamp information. */