bitkeeper revision 1.1236.1.71 (422faefbHaXwbYJDYPLphF7QTxtxMg)

Merge ssh://srg//auto/groups/xeno/BK/xeno.bk
into equilibrium.research:/export/scratch/xeno-usbfixes.bk

linux-2.4.29-xen-sparse/include/asm-xen/page.h

@@ -88,6 +88,7 @@ static inline unsigned long pmd_val(pmd_t x)
     if ( (ret & 1) ) ret = machine_to_phys(ret);
     return ret;
 }
+#define pmd_val_ma(x)   ((x).pmd)
 #define pgd_val(x)	({ BUG(); (unsigned long)0; })
 #define pgprot_val(x)	((x).pgprot)
 

linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c

@@ -725,7 +725,7 @@ static void dispatch_usb_io(usbif_priv_t *up, usbif_request_t *req)
     purb->dev = port->dev;
     purb->context = pending_req;
     purb->transfer_buffer =
-        (void *)MMAP_VADDR(pending_idx, 0) + (buffer_mach & ~PAGE_MASK);
+        (void *)(MMAP_VADDR(pending_idx, 0) + (buffer_mach & ~PAGE_MASK));
     if(buffer_mach == 0)
       purb->transfer_buffer = NULL;
     purb->complete = __end_usb_io_op;

linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c

@@ -331,6 +331,9 @@ static int xhci_port_reset(usbif_vdev_t port)
                 xhci_drain_ring();
         }
 
+	xhci->rh.ports[port].pe = 1;
+	xhci->rh.ports[port].pe_chg = 1;
+
         return xhci->awaiting_reset;
 }