diff -urN RC14-rc4-gfp-simple/drivers/usb/core/buffer.c RC14-rc4-gfp-usb/drivers/usb/core/buffer.c --- RC14-rc4-gfp-simple/drivers/usb/core/buffer.c 2005-08-28 23:09:46.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/core/buffer.c 2005-10-11 14:35:15.000000000 -0400 @@ -106,7 +106,7 @@ void *hcd_buffer_alloc ( struct usb_bus *bus, size_t size, - unsigned mem_flags, + gfp_t mem_flags, dma_addr_t *dma ) { diff -urN RC14-rc4-gfp-simple/drivers/usb/core/hcd.c RC14-rc4-gfp-usb/drivers/usb/core/hcd.c --- RC14-rc4-gfp-simple/drivers/usb/core/hcd.c 2005-09-13 13:29:28.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/core/hcd.c 2005-10-11 14:35:15.000000000 -0400 @@ -1112,7 +1112,7 @@ * expects usb_submit_urb() to have sanity checked and conditioned all * inputs in the urb */ -static int hcd_submit_urb (struct urb *urb, unsigned mem_flags) +static int hcd_submit_urb (struct urb *urb, gfp_t mem_flags) { int status; struct usb_hcd *hcd = urb->dev->bus->hcpriv; diff -urN RC14-rc4-gfp-simple/drivers/usb/core/hcd.h RC14-rc4-gfp-usb/drivers/usb/core/hcd.h --- RC14-rc4-gfp-simple/drivers/usb/core/hcd.h 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/core/hcd.h 2005-10-11 14:35:15.000000000 -0400 @@ -142,12 +142,12 @@ struct usb_operations { int (*get_frame_number) (struct usb_device *usb_dev); - int (*submit_urb) (struct urb *urb, unsigned mem_flags); + int (*submit_urb) (struct urb *urb, gfp_t mem_flags); int (*unlink_urb) (struct urb *urb, int status); /* allocate dma-consistent buffer for URB_DMA_NOMAPPING */ void *(*buffer_alloc)(struct usb_bus *bus, size_t size, - unsigned mem_flags, + gfp_t mem_flags, dma_addr_t *dma); void (*buffer_free)(struct usb_bus *bus, size_t size, void *addr, dma_addr_t dma); @@ -200,7 +200,7 @@ int (*urb_enqueue) (struct usb_hcd *hcd, struct usb_host_endpoint *ep, struct urb *urb, - unsigned mem_flags); + gfp_t mem_flags); int (*urb_dequeue) (struct usb_hcd *hcd, struct urb *urb); /* hw synch, freeing endpoint resources that urb_dequeue can't */ @@ -247,7 +247,7 @@ void hcd_buffer_destroy (struct usb_hcd *hcd); void *hcd_buffer_alloc (struct usb_bus *bus, size_t size, - unsigned mem_flags, dma_addr_t *dma); + gfp_t mem_flags, dma_addr_t *dma); void hcd_buffer_free (struct usb_bus *bus, size_t size, void *addr, dma_addr_t dma); diff -urN RC14-rc4-gfp-simple/drivers/usb/core/message.c RC14-rc4-gfp-usb/drivers/usb/core/message.c --- RC14-rc4-gfp-simple/drivers/usb/core/message.c 2005-09-26 00:19:12.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/core/message.c 2005-10-11 14:35:15.000000000 -0400 @@ -321,7 +321,7 @@ struct scatterlist *sg, int nents, size_t length, - unsigned mem_flags + gfp_t mem_flags ) { int i; diff -urN RC14-rc4-gfp-simple/drivers/usb/core/urb.c RC14-rc4-gfp-usb/drivers/usb/core/urb.c --- RC14-rc4-gfp-simple/drivers/usb/core/urb.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/core/urb.c 2005-10-11 14:35:15.000000000 -0400 @@ -60,7 +60,7 @@ * * The driver must call usb_free_urb() when it is finished with the urb. */ -struct urb *usb_alloc_urb(int iso_packets, unsigned mem_flags) +struct urb *usb_alloc_urb(int iso_packets, gfp_t mem_flags) { struct urb *urb; @@ -224,7 +224,7 @@ * GFP_NOIO, unless b) or c) apply * */ -int usb_submit_urb(struct urb *urb, unsigned mem_flags) +int usb_submit_urb(struct urb *urb, gfp_t mem_flags) { int pipe, temp, max; struct usb_device *dev; diff -urN RC14-rc4-gfp-simple/drivers/usb/core/usb.c RC14-rc4-gfp-usb/drivers/usb/core/usb.c --- RC14-rc4-gfp-simple/drivers/usb/core/usb.c 2005-09-26 00:19:12.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/core/usb.c 2005-10-11 14:35:15.000000000 -0400 @@ -1147,7 +1147,7 @@ void *usb_buffer_alloc ( struct usb_device *dev, size_t size, - unsigned mem_flags, + gfp_t mem_flags, dma_addr_t *dma ) { diff -urN RC14-rc4-gfp-simple/drivers/usb/gadget/dummy_hcd.c RC14-rc4-gfp-usb/drivers/usb/gadget/dummy_hcd.c --- RC14-rc4-gfp-simple/drivers/usb/gadget/dummy_hcd.c 2005-08-28 23:09:46.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/gadget/dummy_hcd.c 2005-10-11 14:35:15.000000000 -0400 @@ -470,7 +470,7 @@ } static struct usb_request * -dummy_alloc_request (struct usb_ep *_ep, unsigned mem_flags) +dummy_alloc_request (struct usb_ep *_ep, gfp_t mem_flags) { struct dummy_ep *ep; struct dummy_request *req; @@ -507,7 +507,7 @@ struct usb_ep *_ep, unsigned bytes, dma_addr_t *dma, - unsigned mem_flags + gfp_t mem_flags ) { char *retval; struct dummy_ep *ep; @@ -541,7 +541,7 @@ static int dummy_queue (struct usb_ep *_ep, struct usb_request *_req, - unsigned mem_flags) + gfp_t mem_flags) { struct dummy_ep *ep; struct dummy_request *req; @@ -999,7 +999,7 @@ struct usb_hcd *hcd, struct usb_host_endpoint *ep, struct urb *urb, - unsigned mem_flags + gfp_t mem_flags ) { struct dummy *dum; struct urbp *urbp; diff -urN RC14-rc4-gfp-simple/drivers/usb/gadget/ether.c RC14-rc4-gfp-usb/drivers/usb/gadget/ether.c --- RC14-rc4-gfp-simple/drivers/usb/gadget/ether.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/gadget/ether.c 2005-10-11 14:35:15.000000000 -0400 @@ -945,11 +945,11 @@ /*-------------------------------------------------------------------------*/ -static void eth_start (struct eth_dev *dev, unsigned gfp_flags); -static int alloc_requests (struct eth_dev *dev, unsigned n, unsigned gfp_flags); +static void eth_start (struct eth_dev *dev, gfp_t gfp_flags); +static int alloc_requests (struct eth_dev *dev, unsigned n, gfp_t gfp_flags); static int -set_ether_config (struct eth_dev *dev, unsigned gfp_flags) +set_ether_config (struct eth_dev *dev, gfp_t gfp_flags) { int result = 0; struct usb_gadget *gadget = dev->gadget; @@ -1081,7 +1081,7 @@ * that returns config descriptors, and altsetting code. */ static int -eth_set_config (struct eth_dev *dev, unsigned number, unsigned gfp_flags) +eth_set_config (struct eth_dev *dev, unsigned number, gfp_t gfp_flags) { int result = 0; struct usb_gadget *gadget = dev->gadget; @@ -1598,7 +1598,7 @@ static void rx_complete (struct usb_ep *ep, struct usb_request *req); static int -rx_submit (struct eth_dev *dev, struct usb_request *req, unsigned gfp_flags) +rx_submit (struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags) { struct sk_buff *skb; int retval = -ENOMEM; @@ -1724,7 +1724,7 @@ } static int prealloc (struct list_head *list, struct usb_ep *ep, - unsigned n, unsigned gfp_flags) + unsigned n, gfp_t gfp_flags) { unsigned i; struct usb_request *req; @@ -1763,7 +1763,7 @@ return 0; } -static int alloc_requests (struct eth_dev *dev, unsigned n, unsigned gfp_flags) +static int alloc_requests (struct eth_dev *dev, unsigned n, gfp_t gfp_flags) { int status; @@ -1779,7 +1779,7 @@ return status; } -static void rx_fill (struct eth_dev *dev, unsigned gfp_flags) +static void rx_fill (struct eth_dev *dev, gfp_t gfp_flags) { struct usb_request *req; unsigned long flags; @@ -1962,7 +1962,7 @@ * normally just one notification will be queued. */ -static struct usb_request *eth_req_alloc (struct usb_ep *, unsigned, unsigned); +static struct usb_request *eth_req_alloc (struct usb_ep *, unsigned, gfp_t); static void eth_req_free (struct usb_ep *ep, struct usb_request *req); static void @@ -2024,7 +2024,7 @@ #endif /* RNDIS */ -static void eth_start (struct eth_dev *dev, unsigned gfp_flags) +static void eth_start (struct eth_dev *dev, gfp_t gfp_flags) { DEBUG (dev, "%s\n", __FUNCTION__); @@ -2092,7 +2092,7 @@ /*-------------------------------------------------------------------------*/ static struct usb_request * -eth_req_alloc (struct usb_ep *ep, unsigned size, unsigned gfp_flags) +eth_req_alloc (struct usb_ep *ep, unsigned size, gfp_t gfp_flags) { struct usb_request *req; diff -urN RC14-rc4-gfp-simple/drivers/usb/gadget/goku_udc.c RC14-rc4-gfp-usb/drivers/usb/gadget/goku_udc.c --- RC14-rc4-gfp-simple/drivers/usb/gadget/goku_udc.c 2005-08-28 23:09:46.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/gadget/goku_udc.c 2005-10-11 14:35:15.000000000 -0400 @@ -269,7 +269,7 @@ /*-------------------------------------------------------------------------*/ static struct usb_request * -goku_alloc_request(struct usb_ep *_ep, unsigned gfp_flags) +goku_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags) { struct goku_request *req; @@ -327,7 +327,7 @@ */ static void * goku_alloc_buffer(struct usb_ep *_ep, unsigned bytes, - dma_addr_t *dma, unsigned gfp_flags) + dma_addr_t *dma, gfp_t gfp_flags) { void *retval; struct goku_ep *ep; @@ -789,7 +789,7 @@ /*-------------------------------------------------------------------------*/ static int -goku_queue(struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags) +goku_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) { struct goku_request *req; struct goku_ep *ep; diff -urN RC14-rc4-gfp-simple/drivers/usb/gadget/lh7a40x_udc.c RC14-rc4-gfp-usb/drivers/usb/gadget/lh7a40x_udc.c --- RC14-rc4-gfp-simple/drivers/usb/gadget/lh7a40x_udc.c 2005-08-28 23:09:46.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/gadget/lh7a40x_udc.c 2005-10-11 14:35:15.000000000 -0400 @@ -71,13 +71,13 @@ static int lh7a40x_ep_enable(struct usb_ep *ep, const struct usb_endpoint_descriptor *); static int lh7a40x_ep_disable(struct usb_ep *ep); -static struct usb_request *lh7a40x_alloc_request(struct usb_ep *ep, int); +static struct usb_request *lh7a40x_alloc_request(struct usb_ep *ep, gfp_t); static void lh7a40x_free_request(struct usb_ep *ep, struct usb_request *); static void *lh7a40x_alloc_buffer(struct usb_ep *ep, unsigned, dma_addr_t *, - int); + gfp_t); static void lh7a40x_free_buffer(struct usb_ep *ep, void *, dma_addr_t, unsigned); -static int lh7a40x_queue(struct usb_ep *ep, struct usb_request *, int); +static int lh7a40x_queue(struct usb_ep *ep, struct usb_request *, gfp_t); static int lh7a40x_dequeue(struct usb_ep *ep, struct usb_request *); static int lh7a40x_set_halt(struct usb_ep *ep, int); static int lh7a40x_fifo_status(struct usb_ep *ep); @@ -1106,7 +1106,7 @@ } static struct usb_request *lh7a40x_alloc_request(struct usb_ep *ep, - unsigned gfp_flags) + gfp_t gfp_flags) { struct lh7a40x_request *req; @@ -1134,7 +1134,7 @@ } static void *lh7a40x_alloc_buffer(struct usb_ep *ep, unsigned bytes, - dma_addr_t * dma, unsigned gfp_flags) + dma_addr_t * dma, gfp_t gfp_flags) { char *retval; @@ -1158,7 +1158,7 @@ * NOTE: Sets INDEX register */ static int lh7a40x_queue(struct usb_ep *_ep, struct usb_request *_req, - unsigned gfp_flags) + gfp_t gfp_flags) { struct lh7a40x_request *req; struct lh7a40x_ep *ep; diff -urN RC14-rc4-gfp-simple/drivers/usb/gadget/net2280.c RC14-rc4-gfp-usb/drivers/usb/gadget/net2280.c --- RC14-rc4-gfp-simple/drivers/usb/gadget/net2280.c 2005-08-28 23:09:46.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/gadget/net2280.c 2005-10-11 14:35:15.000000000 -0400 @@ -376,7 +376,7 @@ /*-------------------------------------------------------------------------*/ static struct usb_request * -net2280_alloc_request (struct usb_ep *_ep, unsigned gfp_flags) +net2280_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags) { struct net2280_ep *ep; struct net2280_request *req; @@ -463,7 +463,7 @@ struct usb_ep *_ep, unsigned bytes, dma_addr_t *dma, - unsigned gfp_flags + gfp_t gfp_flags ) { void *retval; @@ -897,7 +897,7 @@ /*-------------------------------------------------------------------------*/ static int -net2280_queue (struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags) +net2280_queue (struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) { struct net2280_request *req; struct net2280_ep *ep; diff -urN RC14-rc4-gfp-simple/drivers/usb/gadget/omap_udc.c RC14-rc4-gfp-usb/drivers/usb/gadget/omap_udc.c --- RC14-rc4-gfp-simple/drivers/usb/gadget/omap_udc.c 2005-08-28 23:09:46.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/gadget/omap_udc.c 2005-10-11 14:35:15.000000000 -0400 @@ -269,7 +269,7 @@ /*-------------------------------------------------------------------------*/ static struct usb_request * -omap_alloc_request(struct usb_ep *ep, unsigned gfp_flags) +omap_alloc_request(struct usb_ep *ep, gfp_t gfp_flags) { struct omap_req *req; @@ -298,7 +298,7 @@ struct usb_ep *_ep, unsigned bytes, dma_addr_t *dma, - unsigned gfp_flags + gfp_t gfp_flags ) { void *retval; @@ -937,7 +937,7 @@ /*-------------------------------------------------------------------------*/ static int -omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags) +omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) { struct omap_ep *ep = container_of(_ep, struct omap_ep, ep); struct omap_req *req = container_of(_req, struct omap_req, req); diff -urN RC14-rc4-gfp-simple/drivers/usb/gadget/pxa2xx_udc.c RC14-rc4-gfp-usb/drivers/usb/gadget/pxa2xx_udc.c --- RC14-rc4-gfp-simple/drivers/usb/gadget/pxa2xx_udc.c 2005-09-26 00:19:12.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/gadget/pxa2xx_udc.c 2005-10-11 14:35:15.000000000 -0400 @@ -332,7 +332,7 @@ * pxa2xx_ep_alloc_request - allocate a request data structure */ static struct usb_request * -pxa2xx_ep_alloc_request (struct usb_ep *_ep, unsigned gfp_flags) +pxa2xx_ep_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags) { struct pxa2xx_request *req; @@ -367,7 +367,7 @@ */ static void * pxa2xx_ep_alloc_buffer(struct usb_ep *_ep, unsigned bytes, - dma_addr_t *dma, unsigned gfp_flags) + dma_addr_t *dma, gfp_t gfp_flags) { char *retval; @@ -874,7 +874,7 @@ /*-------------------------------------------------------------------------*/ static int -pxa2xx_ep_queue(struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags) +pxa2xx_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) { struct pxa2xx_request *req; struct pxa2xx_ep *ep; diff -urN RC14-rc4-gfp-simple/drivers/usb/gadget/serial.c RC14-rc4-gfp-usb/drivers/usb/gadget/serial.c --- RC14-rc4-gfp-simple/drivers/usb/gadget/serial.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/gadget/serial.c 2005-10-11 14:35:15.000000000 -0400 @@ -300,18 +300,18 @@ u8 type, unsigned int index, int is_otg); static struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned int len, - unsigned kmalloc_flags); + gfp_t kmalloc_flags); static void gs_free_req(struct usb_ep *ep, struct usb_request *req); static struct gs_req_entry *gs_alloc_req_entry(struct usb_ep *ep, unsigned len, - unsigned kmalloc_flags); + gfp_t kmalloc_flags); static void gs_free_req_entry(struct usb_ep *ep, struct gs_req_entry *req); -static int gs_alloc_ports(struct gs_dev *dev, unsigned kmalloc_flags); +static int gs_alloc_ports(struct gs_dev *dev, gfp_t kmalloc_flags); static void gs_free_ports(struct gs_dev *dev); /* circular buffer */ -static struct gs_buf *gs_buf_alloc(unsigned int size, unsigned kmalloc_flags); +static struct gs_buf *gs_buf_alloc(unsigned int size, gfp_t kmalloc_flags); static void gs_buf_free(struct gs_buf *gb); static void gs_buf_clear(struct gs_buf *gb); static unsigned int gs_buf_data_avail(struct gs_buf *gb); @@ -2091,7 +2091,7 @@ * usb_request or NULL if there is an error. */ static struct usb_request * -gs_alloc_req(struct usb_ep *ep, unsigned int len, unsigned kmalloc_flags) +gs_alloc_req(struct usb_ep *ep, unsigned int len, gfp_t kmalloc_flags) { struct usb_request *req; @@ -2132,7 +2132,7 @@ * endpoint, buffer len, and kmalloc flags. */ static struct gs_req_entry * -gs_alloc_req_entry(struct usb_ep *ep, unsigned len, unsigned kmalloc_flags) +gs_alloc_req_entry(struct usb_ep *ep, unsigned len, gfp_t kmalloc_flags) { struct gs_req_entry *req; @@ -2173,7 +2173,7 @@ * * The device lock is normally held when calling this function. */ -static int gs_alloc_ports(struct gs_dev *dev, unsigned kmalloc_flags) +static int gs_alloc_ports(struct gs_dev *dev, gfp_t kmalloc_flags) { int i; struct gs_port *port; @@ -2255,7 +2255,7 @@ * * Allocate a circular buffer and all associated memory. */ -static struct gs_buf *gs_buf_alloc(unsigned int size, unsigned kmalloc_flags) +static struct gs_buf *gs_buf_alloc(unsigned int size, gfp_t kmalloc_flags) { struct gs_buf *gb; diff -urN RC14-rc4-gfp-simple/drivers/usb/gadget/zero.c RC14-rc4-gfp-usb/drivers/usb/gadget/zero.c --- RC14-rc4-gfp-simple/drivers/usb/gadget/zero.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/gadget/zero.c 2005-10-11 14:35:15.000000000 -0400 @@ -612,7 +612,7 @@ } static struct usb_request * -source_sink_start_ep (struct usb_ep *ep, unsigned gfp_flags) +source_sink_start_ep (struct usb_ep *ep, gfp_t gfp_flags) { struct usb_request *req; int status; @@ -640,7 +640,7 @@ } static int -set_source_sink_config (struct zero_dev *dev, unsigned gfp_flags) +set_source_sink_config (struct zero_dev *dev, gfp_t gfp_flags) { int result = 0; struct usb_ep *ep; @@ -744,7 +744,7 @@ } static int -set_loopback_config (struct zero_dev *dev, unsigned gfp_flags) +set_loopback_config (struct zero_dev *dev, gfp_t gfp_flags) { int result = 0; struct usb_ep *ep; @@ -845,7 +845,7 @@ * by limiting configuration choices (like the pxa2xx). */ static int -zero_set_config (struct zero_dev *dev, unsigned number, unsigned gfp_flags) +zero_set_config (struct zero_dev *dev, unsigned number, gfp_t gfp_flags) { int result = 0; struct usb_gadget *gadget = dev->gadget; diff -urN RC14-rc4-gfp-simple/drivers/usb/host/ehci-hcd.c RC14-rc4-gfp-usb/drivers/usb/host/ehci-hcd.c --- RC14-rc4-gfp-simple/drivers/usb/host/ehci-hcd.c 2005-09-13 13:29:28.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/host/ehci-hcd.c 2005-10-11 14:35:15.000000000 -0400 @@ -983,7 +983,7 @@ struct usb_hcd *hcd, struct usb_host_endpoint *ep, struct urb *urb, - unsigned mem_flags + gfp_t mem_flags ) { struct ehci_hcd *ehci = hcd_to_ehci (hcd); struct list_head qtd_list; diff -urN RC14-rc4-gfp-simple/drivers/usb/host/ehci-mem.c RC14-rc4-gfp-usb/drivers/usb/host/ehci-mem.c --- RC14-rc4-gfp-simple/drivers/usb/host/ehci-mem.c 2005-06-17 15:48:29.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/host/ehci-mem.c 2005-10-11 14:35:15.000000000 -0400 @@ -45,7 +45,7 @@ INIT_LIST_HEAD (&qtd->qtd_list); } -static struct ehci_qtd *ehci_qtd_alloc (struct ehci_hcd *ehci, int flags) +static struct ehci_qtd *ehci_qtd_alloc (struct ehci_hcd *ehci, gfp_t flags) { struct ehci_qtd *qtd; dma_addr_t dma; @@ -79,7 +79,7 @@ dma_pool_free (ehci->qh_pool, qh, qh->qh_dma); } -static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, int flags) +static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags) { struct ehci_qh *qh; dma_addr_t dma; @@ -161,7 +161,7 @@ } /* remember to add cleanup code (above) if you add anything here */ -static int ehci_mem_init (struct ehci_hcd *ehci, int flags) +static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags) { int i; diff -urN RC14-rc4-gfp-simple/drivers/usb/host/ehci-q.c RC14-rc4-gfp-usb/drivers/usb/host/ehci-q.c --- RC14-rc4-gfp-simple/drivers/usb/host/ehci-q.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/host/ehci-q.c 2005-10-11 14:35:15.000000000 -0400 @@ -477,7 +477,7 @@ struct ehci_hcd *ehci, struct urb *urb, struct list_head *head, - int flags + gfp_t flags ) { struct ehci_qtd *qtd, *qtd_prev; dma_addr_t buf; @@ -629,7 +629,7 @@ qh_make ( struct ehci_hcd *ehci, struct urb *urb, - int flags + gfp_t flags ) { struct ehci_qh *qh = ehci_qh_alloc (ehci, flags); u32 info1 = 0, info2 = 0; @@ -906,7 +906,7 @@ struct usb_host_endpoint *ep, struct urb *urb, struct list_head *qtd_list, - unsigned mem_flags + gfp_t mem_flags ) { struct ehci_qtd *qtd; int epnum; diff -urN RC14-rc4-gfp-simple/drivers/usb/host/ehci-sched.c RC14-rc4-gfp-usb/drivers/usb/host/ehci-sched.c --- RC14-rc4-gfp-simple/drivers/usb/host/ehci-sched.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/host/ehci-sched.c 2005-10-11 14:35:15.000000000 -0400 @@ -589,7 +589,7 @@ struct usb_host_endpoint *ep, struct urb *urb, struct list_head *qtd_list, - unsigned mem_flags + gfp_t mem_flags ) { unsigned epnum; unsigned long flags; @@ -634,7 +634,7 @@ /* ehci_iso_stream ops work with both ITD and SITD */ static struct ehci_iso_stream * -iso_stream_alloc (unsigned mem_flags) +iso_stream_alloc (gfp_t mem_flags) { struct ehci_iso_stream *stream; @@ -851,7 +851,7 @@ /* ehci_iso_sched ops can be ITD-only or SITD-only */ static struct ehci_iso_sched * -iso_sched_alloc (unsigned packets, unsigned mem_flags) +iso_sched_alloc (unsigned packets, gfp_t mem_flags) { struct ehci_iso_sched *iso_sched; int size = sizeof *iso_sched; @@ -924,7 +924,7 @@ struct ehci_iso_stream *stream, struct ehci_hcd *ehci, struct urb *urb, - unsigned mem_flags + gfp_t mem_flags ) { struct ehci_itd *itd; @@ -1418,7 +1418,7 @@ /*-------------------------------------------------------------------------*/ static int itd_submit (struct ehci_hcd *ehci, struct urb *urb, - unsigned mem_flags) + gfp_t mem_flags) { int status = -EINVAL; unsigned long flags; @@ -1529,7 +1529,7 @@ struct ehci_iso_stream *stream, struct ehci_hcd *ehci, struct urb *urb, - unsigned mem_flags + gfp_t mem_flags ) { struct ehci_sitd *sitd; @@ -1779,7 +1779,7 @@ static int sitd_submit (struct ehci_hcd *ehci, struct urb *urb, - unsigned mem_flags) + gfp_t mem_flags) { int status = -EINVAL; unsigned long flags; diff -urN RC14-rc4-gfp-simple/drivers/usb/host/isp116x-hcd.c RC14-rc4-gfp-usb/drivers/usb/host/isp116x-hcd.c --- RC14-rc4-gfp-simple/drivers/usb/host/isp116x-hcd.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/host/isp116x-hcd.c 2005-10-11 14:35:15.000000000 -0400 @@ -693,7 +693,7 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd, struct usb_host_endpoint *hep, struct urb *urb, - unsigned mem_flags) + gfp_t mem_flags) { struct isp116x *isp116x = hcd_to_isp116x(hcd); struct usb_device *udev = urb->dev; diff -urN RC14-rc4-gfp-simple/drivers/usb/host/ohci-hcd.c RC14-rc4-gfp-usb/drivers/usb/host/ohci-hcd.c --- RC14-rc4-gfp-simple/drivers/usb/host/ohci-hcd.c 2005-09-13 13:29:28.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/host/ohci-hcd.c 2005-10-11 14:35:15.000000000 -0400 @@ -180,7 +180,7 @@ struct usb_hcd *hcd, struct usb_host_endpoint *ep, struct urb *urb, - unsigned mem_flags + gfp_t mem_flags ) { struct ohci_hcd *ohci = hcd_to_ohci (hcd); struct ed *ed; diff -urN RC14-rc4-gfp-simple/drivers/usb/host/ohci-mem.c RC14-rc4-gfp-usb/drivers/usb/host/ohci-mem.c --- RC14-rc4-gfp-simple/drivers/usb/host/ohci-mem.c 2005-08-28 23:09:46.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/host/ohci-mem.c 2005-10-11 14:35:15.000000000 -0400 @@ -84,7 +84,7 @@ /* TDs ... */ static struct td * -td_alloc (struct ohci_hcd *hc, unsigned mem_flags) +td_alloc (struct ohci_hcd *hc, gfp_t mem_flags) { dma_addr_t dma; struct td *td; @@ -118,7 +118,7 @@ /* EDs ... */ static struct ed * -ed_alloc (struct ohci_hcd *hc, unsigned mem_flags) +ed_alloc (struct ohci_hcd *hc, gfp_t mem_flags) { dma_addr_t dma; struct ed *ed; diff -urN RC14-rc4-gfp-simple/drivers/usb/host/sl811-hcd.c RC14-rc4-gfp-usb/drivers/usb/host/sl811-hcd.c --- RC14-rc4-gfp-simple/drivers/usb/host/sl811-hcd.c 2005-09-26 00:19:12.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/host/sl811-hcd.c 2005-10-11 14:35:15.000000000 -0400 @@ -818,7 +818,7 @@ struct usb_hcd *hcd, struct usb_host_endpoint *hep, struct urb *urb, - unsigned mem_flags + gfp_t mem_flags ) { struct sl811 *sl811 = hcd_to_sl811(hcd); struct usb_device *udev = urb->dev; diff -urN RC14-rc4-gfp-simple/drivers/usb/host/uhci-q.c RC14-rc4-gfp-usb/drivers/usb/host/uhci-q.c --- RC14-rc4-gfp-simple/drivers/usb/host/uhci-q.c 2005-09-13 13:29:28.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/host/uhci-q.c 2005-10-11 14:35:15.000000000 -0400 @@ -1164,7 +1164,7 @@ static int uhci_urb_enqueue(struct usb_hcd *hcd, struct usb_host_endpoint *ep, - struct urb *urb, unsigned mem_flags) + struct urb *urb, gfp_t mem_flags) { int ret; struct uhci_hcd *uhci = hcd_to_uhci(hcd); diff -urN RC14-rc4-gfp-simple/drivers/usb/misc/uss720.c RC14-rc4-gfp-usb/drivers/usb/misc/uss720.c --- RC14-rc4-gfp-simple/drivers/usb/misc/uss720.c 2005-09-13 13:29:28.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/misc/uss720.c 2005-10-11 14:35:15.000000000 -0400 @@ -137,7 +137,7 @@ static struct uss720_async_request *submit_async_request(struct parport_uss720_private *priv, __u8 request, __u8 requesttype, __u16 value, __u16 index, - unsigned int mem_flags) + gfp_t mem_flags) { struct usb_device *usbdev; struct uss720_async_request *rq; @@ -204,7 +204,7 @@ /* --------------------------------------------------------------------- */ -static int get_1284_register(struct parport *pp, unsigned char reg, unsigned char *val, unsigned int mem_flags) +static int get_1284_register(struct parport *pp, unsigned char reg, unsigned char *val, gfp_t mem_flags) { struct parport_uss720_private *priv; struct uss720_async_request *rq; @@ -238,7 +238,7 @@ return -EIO; } -static int set_1284_register(struct parport *pp, unsigned char reg, unsigned char val, unsigned int mem_flags) +static int set_1284_register(struct parport *pp, unsigned char reg, unsigned char val, gfp_t mem_flags) { struct parport_uss720_private *priv; struct uss720_async_request *rq; diff -urN RC14-rc4-gfp-simple/drivers/usb/net/asix.c RC14-rc4-gfp-usb/drivers/usb/net/asix.c --- RC14-rc4-gfp-simple/drivers/usb/net/asix.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/net/asix.c 2005-10-11 14:35:15.000000000 -0400 @@ -753,7 +753,7 @@ } static struct sk_buff *ax88772_tx_fixup(struct usbnet *dev, struct sk_buff *skb, - unsigned flags) + gfp_t flags) { int padlen; int headroom = skb_headroom(skb); diff -urN RC14-rc4-gfp-simple/drivers/usb/net/gl620a.c RC14-rc4-gfp-usb/drivers/usb/net/gl620a.c --- RC14-rc4-gfp-simple/drivers/usb/net/gl620a.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/net/gl620a.c 2005-10-11 14:35:15.000000000 -0400 @@ -301,7 +301,7 @@ } static struct sk_buff * -genelink_tx_fixup(struct usbnet *dev, struct sk_buff *skb, unsigned flags) +genelink_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) { int padlen; int length = skb->len; diff -urN RC14-rc4-gfp-simple/drivers/usb/net/kaweth.c RC14-rc4-gfp-usb/drivers/usb/net/kaweth.c --- RC14-rc4-gfp-simple/drivers/usb/net/kaweth.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/net/kaweth.c 2005-10-11 14:35:15.000000000 -0400 @@ -477,13 +477,13 @@ } static void kaweth_usb_receive(struct urb *, struct pt_regs *regs); -static int kaweth_resubmit_rx_urb(struct kaweth_device *, unsigned); +static int kaweth_resubmit_rx_urb(struct kaweth_device *, gfp_t); /**************************************************************** int_callback *****************************************************************/ -static void kaweth_resubmit_int_urb(struct kaweth_device *kaweth, int mf) +static void kaweth_resubmit_int_urb(struct kaweth_device *kaweth, gfp_t mf) { int status; @@ -550,7 +550,7 @@ * kaweth_resubmit_rx_urb ****************************************************************/ static int kaweth_resubmit_rx_urb(struct kaweth_device *kaweth, - unsigned mem_flags) + gfp_t mem_flags) { int result; diff -urN RC14-rc4-gfp-simple/drivers/usb/net/net1080.c RC14-rc4-gfp-usb/drivers/usb/net/net1080.c --- RC14-rc4-gfp-simple/drivers/usb/net/net1080.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/net/net1080.c 2005-10-11 14:35:15.000000000 -0400 @@ -500,7 +500,7 @@ } static struct sk_buff * -net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, unsigned flags) +net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) { int padlen; struct sk_buff *skb2; diff -urN RC14-rc4-gfp-simple/drivers/usb/net/rndis_host.c RC14-rc4-gfp-usb/drivers/usb/net/rndis_host.c --- RC14-rc4-gfp-simple/drivers/usb/net/rndis_host.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/net/rndis_host.c 2005-10-11 14:35:15.000000000 -0400 @@ -517,7 +517,7 @@ } static struct sk_buff * -rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, unsigned flags) +rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) { struct rndis_data_hdr *hdr; struct sk_buff *skb2; diff -urN RC14-rc4-gfp-simple/drivers/usb/net/usbnet.c RC14-rc4-gfp-usb/drivers/usb/net/usbnet.c --- RC14-rc4-gfp-simple/drivers/usb/net/usbnet.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/net/usbnet.c 2005-10-11 14:35:15.000000000 -0400 @@ -288,7 +288,7 @@ static void rx_complete (struct urb *urb, struct pt_regs *regs); -static void rx_submit (struct usbnet *dev, struct urb *urb, unsigned flags) +static void rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags) { struct sk_buff *skb; struct skb_data *entry; diff -urN RC14-rc4-gfp-simple/drivers/usb/net/usbnet.h RC14-rc4-gfp-usb/drivers/usb/net/usbnet.h --- RC14-rc4-gfp-simple/drivers/usb/net/usbnet.h 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/net/usbnet.h 2005-10-11 14:35:15.000000000 -0400 @@ -107,7 +107,7 @@ /* fixup tx packet (add framing) */ struct sk_buff *(*tx_fixup)(struct usbnet *dev, - struct sk_buff *skb, unsigned flags); + struct sk_buff *skb, gfp_t flags); /* for new devices, use the descriptor-reading code instead */ int in; /* rx endpoint */ diff -urN RC14-rc4-gfp-simple/drivers/usb/net/zaurus.c RC14-rc4-gfp-usb/drivers/usb/net/zaurus.c --- RC14-rc4-gfp-simple/drivers/usb/net/zaurus.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/net/zaurus.c 2005-10-11 14:35:15.000000000 -0400 @@ -62,7 +62,7 @@ */ static struct sk_buff * -zaurus_tx_fixup(struct usbnet *dev, struct sk_buff *skb, unsigned flags) +zaurus_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) { int padlen; struct sk_buff *skb2; diff -urN RC14-rc4-gfp-simple/drivers/usb/net/zd1201.c RC14-rc4-gfp-usb/drivers/usb/net/zd1201.c --- RC14-rc4-gfp-simple/drivers/usb/net/zd1201.c 2005-09-10 15:41:34.000000000 -0400 +++ RC14-rc4-gfp-usb/drivers/usb/net/zd1201.c 2005-10-11 14:35:15.000000000 -0400 @@ -521,7 +521,7 @@ int reqlen; char seq=0; struct urb *urb; - unsigned int gfp_mask = wait ? GFP_NOIO : GFP_ATOMIC; + gfp_t gfp_mask = wait ? GFP_NOIO : GFP_ATOMIC; len += 4; /* first 4 are for header */ diff -urN RC14-rc4-gfp-simple/include/linux/usb.h RC14-rc4-gfp-usb/include/linux/usb.h --- RC14-rc4-gfp-simple/include/linux/usb.h 2005-09-10 15:41:35.000000000 -0400 +++ RC14-rc4-gfp-usb/include/linux/usb.h 2005-10-11 14:35:15.000000000 -0400 @@ -933,17 +933,17 @@ } extern void usb_init_urb(struct urb *urb); -extern struct urb *usb_alloc_urb(int iso_packets, unsigned mem_flags); +extern struct urb *usb_alloc_urb(int iso_packets, gfp_t mem_flags); extern void usb_free_urb(struct urb *urb); #define usb_put_urb usb_free_urb extern struct urb *usb_get_urb(struct urb *urb); -extern int usb_submit_urb(struct urb *urb, unsigned mem_flags); +extern int usb_submit_urb(struct urb *urb, gfp_t mem_flags); extern int usb_unlink_urb(struct urb *urb); extern void usb_kill_urb(struct urb *urb); #define HAVE_USB_BUFFERS void *usb_buffer_alloc (struct usb_device *dev, size_t size, - unsigned mem_flags, dma_addr_t *dma); + gfp_t mem_flags, dma_addr_t *dma); void usb_buffer_free (struct usb_device *dev, size_t size, void *addr, dma_addr_t dma); @@ -1050,7 +1050,7 @@ struct scatterlist *sg, int nents, size_t length, - unsigned mem_flags + gfp_t mem_flags ); void usb_sg_cancel (struct usb_sg_request *io); void usb_sg_wait (struct usb_sg_request *io); diff -urN RC14-rc4-gfp-simple/include/linux/usb_gadget.h RC14-rc4-gfp-usb/include/linux/usb_gadget.h --- RC14-rc4-gfp-simple/include/linux/usb_gadget.h 2005-08-28 23:09:49.000000000 -0400 +++ RC14-rc4-gfp-usb/include/linux/usb_gadget.h 2005-10-11 14:35:15.000000000 -0400 @@ -107,18 +107,18 @@ int (*disable) (struct usb_ep *ep); struct usb_request *(*alloc_request) (struct usb_ep *ep, - unsigned gfp_flags); + gfp_t gfp_flags); void (*free_request) (struct usb_ep *ep, struct usb_request *req); void *(*alloc_buffer) (struct usb_ep *ep, unsigned bytes, - dma_addr_t *dma, unsigned gfp_flags); + dma_addr_t *dma, gfp_t gfp_flags); void (*free_buffer) (struct usb_ep *ep, void *buf, dma_addr_t dma, unsigned bytes); // NOTE: on 2.6, drivers may also use dma_map() and // dma_sync_single_*() to directly manage dma overhead. int (*queue) (struct usb_ep *ep, struct usb_request *req, - unsigned gfp_flags); + gfp_t gfp_flags); int (*dequeue) (struct usb_ep *ep, struct usb_request *req); int (*set_halt) (struct usb_ep *ep, int value); @@ -214,7 +214,7 @@ * Returns the request, or null if one could not be allocated. */ static inline struct usb_request * -usb_ep_alloc_request (struct usb_ep *ep, unsigned gfp_flags) +usb_ep_alloc_request (struct usb_ep *ep, gfp_t gfp_flags) { return ep->ops->alloc_request (ep, gfp_flags); } @@ -254,7 +254,7 @@ */ static inline void * usb_ep_alloc_buffer (struct usb_ep *ep, unsigned len, dma_addr_t *dma, - unsigned gfp_flags) + gfp_t gfp_flags) { return ep->ops->alloc_buffer (ep, len, dma, gfp_flags); } @@ -330,7 +330,7 @@ * reported when the usb peripheral is disconnected. */ static inline int -usb_ep_queue (struct usb_ep *ep, struct usb_request *req, unsigned gfp_flags) +usb_ep_queue (struct usb_ep *ep, struct usb_request *req, gfp_t gfp_flags) { return ep->ops->queue (ep, req, gfp_flags); } diff -urN RC14-rc4-gfp-simple/sound/usb/usbmidi.c RC14-rc4-gfp-usb/sound/usb/usbmidi.c --- RC14-rc4-gfp-simple/sound/usb/usbmidi.c 2005-09-22 01:17:31.000000000 -0400 +++ RC14-rc4-gfp-usb/sound/usb/usbmidi.c 2005-10-11 14:35:15.000000000 -0400 @@ -163,7 +163,7 @@ /* * Submits the URB, with error handling. */ -static int snd_usbmidi_submit_urb(struct urb* urb, int flags) +static int snd_usbmidi_submit_urb(struct urb* urb, gfp_t flags) { int err = usb_submit_urb(urb, flags); if (err < 0 && err != -ENODEV)