[Xen-changelog] merge?

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 501a70f3ae968e46e27b9003febf05253f4cf949
# Parent  e2d635617acd58e01dc87145f5d30a3a1143ad01
# Parent  80fed4ff19b2423feb98ceddf5cf98218836699d
merge?

diff -r e2d635617acd -r 501a70f3ae96 
linux-2.6-xen-sparse/arch/xen/i386/kernel/irq.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/irq.c   Thu Jul 28 12:33:53 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/irq.c   Thu Jul 28 12:34:45 2005
@@ -263,7 +263,6 @@
 void fixup_irqs(cpumask_t map)
 {
        unsigned int irq;
-       static int warned;
 
        for (irq = 0; irq < NR_IRQS; irq++) {
                cpumask_t mask;
diff -r e2d635617acd -r 501a70f3ae96 
linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Thu Jul 28 
12:33:53 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Thu Jul 28 
12:34:45 2005
@@ -1428,8 +1428,9 @@
     int i;
 
 #ifdef CONFIG_XEN_BLKDEV_GRANT
-    if ( 0 > gnttab_alloc_grant_references( MAXIMUM_OUTSTANDING_BLOCK_REQS,
-                                            &gref_head, &gref_terminal ))
+    /* A grant for every ring slot, plus one for the ring itself. */
+    if ( 0 > gnttab_alloc_grant_references(MAXIMUM_OUTSTANDING_BLOCK_REQS + 1,
+                                           &gref_head, &gref_terminal) )
         return 1;
     printk(KERN_ALERT "Blkif frontend is using grant tables.\n");
 #endif
diff -r e2d635617acd -r 501a70f3ae96 xen/arch/x86/time.c
--- a/xen/arch/x86/time.c       Thu Jul 28 12:33:53 2005
+++ b/xen/arch/x86/time.c       Thu Jul 28 12:34:45 2005
@@ -233,6 +233,16 @@
     atomic_dec(&tsc_calibrate_gang);
 }
 
+static char *freq_string(u64 freq)
+{
+    static char s[20];
+    unsigned int x, y;
+    y = (unsigned int)do_div(freq, 1000000) / 1000;
+    x = (unsigned int)freq;
+    sprintf(s, "%u.%03uMHz", x, y);
+    return s;
+}
+
 /************************************************************
  * PLATFORM TIMER 1: PROGRAMMABLE INTERVAL TIMER (LEGACY PIT)
  */
@@ -279,7 +289,7 @@
     platform_timer_stamp = pit_counter64;
     set_time_scale(&platform_timer_scale, CLOCK_TICK_RATE);
 
-    printk("Platform timer is PIT\n");
+    printk("Platform timer is %s PIT\n", freq_string(CLOCK_TICK_RATE));
 
     return 1;
 }
@@ -319,12 +329,11 @@
 
     if ( (hpet_address == 0) && opt_hpet_force )
     {
-        printk(KERN_WARNING "WARNING: Enabling HPET base manually!\n");
         outl(0x800038a0, 0xcf8);
         outl(0xff000001, 0xcfc);
         outl(0x800038a0, 0xcf8);
         hpet_address = inl(0xcfc) & 0xfffffffe;
-        printk(KERN_WARNING "WARNING: Enabled HPET at %#lx.\n", hpet_address);
+        printk("WARNING: Forcibly enabled HPET at %#lx.\n", hpet_address);
     }
 
     if ( hpet_address == 0 )
@@ -384,7 +393,7 @@
     hpet_overflow(NULL);
     platform_timer_stamp = hpet_counter64;
 
-    printk("Platform timer is HPET\n");
+    printk("Platform timer is %s HPET\n", freq_string(hpet_rate));
 
     return 1;
 }
@@ -465,7 +474,8 @@
     platform_timer_stamp = cyclone_counter64;
     set_time_scale(&platform_timer_scale, CYCLONE_TIMER_FREQ);
 
-    printk("Platform timer is IBM Cyclone\n");
+    printk("Platform timer is %s IBM Cyclone\n",
+           freq_string(CYCLONE_TIMER_FREQ));
 
     return 1;
 }
@@ -713,8 +723,9 @@
 #if 0
     printk("PRE%d: tsc=%lld stime=%lld master=%lld\n",
            cpu, prev_tsc, prev_local_stime, prev_master_stime);
-    printk("CUR%d: tsc=%lld stime=%lld master=%lld\n",
-           cpu, curr_tsc, curr_local_stime, curr_master_stime);
+    printk("CUR%d: tsc=%lld stime=%lld master=%lld -> %lld\n",
+           cpu, curr_tsc, curr_local_stime, curr_master_stime,
+           curr_master_stime - curr_local_stime);
 #endif
 
     /* Local time warps forward if it lags behind master time. */
@@ -776,7 +787,8 @@
         calibration_mul_frac = mul_frac(calibration_mul_frac, error_factor);
 
 #if 0
-    printk("---%d: %08x %d\n", cpu, calibration_mul_frac, tsc_shift);
+    printk("---%d: %08x %08x %d\n", cpu,
+           error_factor, calibration_mul_frac, tsc_shift);
 #endif
 
     /* Record new timestamp information. */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog