bitkeeper revision 1.1236.12.28 (422fae60QUL5If3Rfo9gd_stvUYcmw)

Doh!  Remove call to a 2.6 only function.  Silly me :-(

Signed-off-by: <mark.williamson@cl.cam.ac.uk>

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 d20833616e423499d8b8303558a7c710b8f1005b..b039b4506b06853f732986748f0fcbb7da27dc3a 100644 (file)
--- 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;