ia64/xen-unstable

changeset 4062:254b6cc19f34

bitkeeper revision 1.1236.1.71 (422faefbHaXwbYJDYPLphF7QTxtxMg)

Merge ssh://srg//auto/groups/xeno/BK/xeno.bk
into equilibrium.research:/export/scratch/xeno-usbfixes.bk
author mwilli2@equilibrium.research
date Thu Mar 10 02:20:43 2005 +0000 (2005-03-10)
parents 586e5a7db87a a40eb0f50026
children 3dafdc84f1a2 78dff7880271 4baf30dc2398
files linux-2.4.29-xen-sparse/include/asm-xen/page.h linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c
line diff
     1.1 --- a/linux-2.4.29-xen-sparse/include/asm-xen/page.h	Wed Mar 09 22:27:14 2005 +0000
     1.2 +++ b/linux-2.4.29-xen-sparse/include/asm-xen/page.h	Thu Mar 10 02:20:43 2005 +0000
     1.3 @@ -88,6 +88,7 @@ static inline unsigned long pmd_val(pmd_
     1.4      if ( (ret & 1) ) ret = machine_to_phys(ret);
     1.5      return ret;
     1.6  }
     1.7 +#define pmd_val_ma(x)   ((x).pmd)
     1.8  #define pgd_val(x)	({ BUG(); (unsigned long)0; })
     1.9  #define pgprot_val(x)	((x).pgprot)
    1.10  
     2.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c	Wed Mar 09 22:27:14 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c	Thu Mar 10 02:20:43 2005 +0000
     2.3 @@ -725,7 +725,7 @@ static void dispatch_usb_io(usbif_priv_t
     2.4      purb->dev = port->dev;
     2.5      purb->context = pending_req;
     2.6      purb->transfer_buffer =
     2.7 -        (void *)MMAP_VADDR(pending_idx, 0) + (buffer_mach & ~PAGE_MASK);
     2.8 +        (void *)(MMAP_VADDR(pending_idx, 0) + (buffer_mach & ~PAGE_MASK));
     2.9      if(buffer_mach == 0)
    2.10        purb->transfer_buffer = NULL;
    2.11      purb->complete = __end_usb_io_op;
     3.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c	Wed Mar 09 22:27:14 2005 +0000
     3.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c	Thu Mar 10 02:20:43 2005 +0000
     3.3 @@ -331,6 +331,9 @@ static int xhci_port_reset(usbif_vdev_t 
     3.4                  xhci_drain_ring();
     3.5          }
     3.6  
     3.7 +	xhci->rh.ports[port].pe = 1;
     3.8 +	xhci->rh.ports[port].pe_chg = 1;
     3.9 +
    3.10          return xhci->awaiting_reset;
    3.11  }
    3.12