From 495ffe8b8ffa1eef7f2fe26b74a2684820c2cbba Mon Sep 17 00:00:00 2001 From: "mark@maw48.kings.cam.ac.uk" Date: Wed, 9 Mar 2005 20:09:10 +0000 Subject: [PATCH 1/3] bitkeeper revision 1.1236.20.1 (422f57e64AxXLq_2TgjJdCVeFgugMg) Hopefully fix hotplugging. --- linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c | 2 +- linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c b/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c index fc98ac18a7..d20833616e 100644 --- a/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c +++ b/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) + offset_in_page(buffer_mach)); if(buffer_mach == 0) purb->transfer_buffer = NULL; purb->complete = __end_usb_io_op; diff --git a/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c b/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c index 5fe65a7cba..46cca3058a 100644 --- a/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c +++ b/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; } From 0a5ef13e8e50b936397c28ec6bb2642b32d64ddf Mon Sep 17 00:00:00 2001 From: "mwilli2@equilibrium.research" Date: Thu, 10 Mar 2005 02:18:08 +0000 Subject: [PATCH 2/3] bitkeeper revision 1.1236.12.28 (422fae60QUL5If3Rfo9gd_stvUYcmw) Doh! Remove call to a 2.6 only function. Silly me :-( Signed-off-by: --- linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c b/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c index d20833616e..b039b4506b 100644 --- a/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c +++ b/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) + offset_in_page(buffer_mach)); + (void *)(MMAP_VADDR(pending_idx, 0) + (buffer_mach & ~PAGE_MASK)); if(buffer_mach == 0) purb->transfer_buffer = NULL; purb->complete = __end_usb_io_op; From 7bc18be2543457c1c0ad6c956c414036a4f7fe54 Mon Sep 17 00:00:00 2001 From: "mwilli2@equilibrium.research" Date: Thu, 10 Mar 2005 02:19:53 +0000 Subject: [PATCH 3/3] bitkeeper revision 1.1236.12.29 (422faec9cZXX4zIVbvTV30eJRoDSwQ) A recent change to the privop driver broke the 2.4 build, this patch fixes it by pulling in a new macro from 2.6's page.h. Signed-off-by: --- linux-2.4.29-xen-sparse/include/asm-xen/page.h | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/page.h b/linux-2.4.29-xen-sparse/include/asm-xen/page.h index 78863c36da..fbab7f5ff1 100644 --- a/linux-2.4.29-xen-sparse/include/asm-xen/page.h +++ b/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)