[Xen-changelog] [linux-2.6.18-xen] merge with linux-2.6.18-xen.hg

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1186008066 21600
# Node ID dd415303b25f9f65c3dca0e6d7c385deaf47082d
# Parent  59582461a590f996fc2d09f14e4cef2625beb8de
# Parent  8d5ae51a09a66ff450b46ebb09ff99475604ed91
merge with linux-2.6.18-xen.hg
---
 drivers/acpi/Kconfig              |    2 +-
 drivers/xen/blkfront/vbd.c        |    3 +++
 drivers/xen/blktap/blktap.c       |   14 --------------
 drivers/xen/netback/loopback.c    |    4 ++++
 drivers/xen/xenbus/xenbus_probe.c |    6 +++---
 5 files changed, 11 insertions(+), 18 deletions(-)

diff -r 59582461a590 -r dd415303b25f drivers/acpi/Kconfig
--- a/drivers/acpi/Kconfig      Wed Aug 01 11:23:36 2007 -0600
+++ b/drivers/acpi/Kconfig      Wed Aug 01 16:41:06 2007 -0600
@@ -365,7 +365,7 @@ config ACPI_SBS
 
 config ACPI_PV_SLEEP
        bool
-       depends on X86 && XEN
+       depends on X86 && XEN && ACPI_SLEEP
        default y
 endif  # ACPI
 
diff -r 59582461a590 -r dd415303b25f drivers/xen/blkfront/vbd.c
--- a/drivers/xen/blkfront/vbd.c        Wed Aug 01 11:23:36 2007 -0600
+++ b/drivers/xen/blkfront/vbd.c        Wed Aug 01 16:41:06 2007 -0600
@@ -213,6 +213,9 @@ xlvbd_init_blk_queue(struct gendisk *gd,
        /* Make sure buffer addresses are sector-aligned. */
        blk_queue_dma_alignment(rq, 511);
 
+       /* Make sure we don't use bounce buffers. */
+       blk_queue_bounce_limit(rq, BLK_BOUNCE_ANY);
+
        gd->queue = rq;
 
        return 0;
diff -r 59582461a590 -r dd415303b25f drivers/xen/blktap/blktap.c
--- a/drivers/xen/blktap/blktap.c       Wed Aug 01 11:23:36 2007 -0600
+++ b/drivers/xen/blktap/blktap.c       Wed Aug 01 16:41:06 2007 -0600
@@ -1300,7 +1300,6 @@ static void dispatch_rw_block_io(blkif_t
        unsigned int nseg;
        int ret, i, nr_sects = 0;
        tap_blkif_t *info;
-       uint64_t sector;
        blkif_request_t *target;
        int pending_idx = RTN_PEND_IDX(pending_req,pending_req->mem_idx);
        int usr_idx;
@@ -1356,19 +1355,6 @@ static void dispatch_rw_block_io(blkif_t
 
                uvaddr = MMAP_VADDR(info->user_vstart, usr_idx, i);
                kvaddr = idx_to_kaddr(mmap_idx, pending_idx, i);
-
-               sector = req->sector_number + ((PAGE_SIZE / 512) * i);
-               if( (blkif->sectors > 0) && (sector >= blkif->sectors) ) {
-                       WPRINTK("BLKTAP: Sector request greater" 
-                              "than size\n");
-                       WPRINTK("BLKTAP: %s request sector" 
-                              "[%llu,%llu], Total [%llu]\n",
-                              (req->operation == 
-                               BLKIF_OP_WRITE ? "WRITE" : "READ"),
-                               (long long unsigned) sector,
-                               (long long unsigned) sector>>9,
-                               (long long unsigned) blkif->sectors);
-               }
 
                flags = GNTMAP_host_map;
                if (operation == WRITE)
diff -r 59582461a590 -r dd415303b25f drivers/xen/netback/loopback.c
--- a/drivers/xen/netback/loopback.c    Wed Aug 01 11:23:36 2007 -0600
+++ b/drivers/xen/netback/loopback.c    Wed Aug 01 16:41:06 2007 -0600
@@ -99,6 +99,10 @@ static int skb_remove_foreign_references
 
        BUG_ON(skb_shinfo(skb)->frag_list);
 
+       if (skb_cloned(skb) &&
+           unlikely(pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
+               return 0;
+
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                pfn = page_to_pfn(skb_shinfo(skb)->frags[i].page);
                if (!is_foreign(pfn))
diff -r 59582461a590 -r dd415303b25f drivers/xen/xenbus/xenbus_probe.c
--- a/drivers/xen/xenbus/xenbus_probe.c Wed Aug 01 11:23:36 2007 -0600
+++ b/drivers/xen/xenbus/xenbus_probe.c Wed Aug 01 16:41:06 2007 -0600
@@ -1075,7 +1075,7 @@ static int ready_to_wait_for_devices;
 static int ready_to_wait_for_devices;
 
 /*
- * On a 30-second timeout, wait for all devices currently configured.  We need
+ * On a 5-minute timeout, wait for all devices currently configured.  We need
  * to do this to guarantee that the filesystems and / or network devices
  * needed for boot are available, before we can allow the boot to proceed.
  *
@@ -1103,8 +1103,8 @@ static void wait_for_devices(struct xenb
                                printk(KERN_WARNING "XENBUS: Waiting for "
                                       "devices to initialise: ");
                        seconds_waited += 5;
-                       printk("%us...", 30 - seconds_waited);
-                       if (seconds_waited == 30)
+                       printk("%us...", 300 - seconds_waited);
+                       if (seconds_waited == 300)
                                break;
                }
                

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