@@ -108,10 +108,6 @@ void hcd_buffer_destroy(struct usb_hcd *hcd)
}
-/* sometimes alloc/free could use kmalloc with GFP_DMA, for
- * better sharing and to leverage mm/slab.c intelligence.
- */
-
void *hcd_buffer_alloc(
struct usb_bus *bus,
size_t size,
@@ -128,6 +124,9 @@ void *hcd_buffer_alloc(
if (hcd->localmem_pool)
return gen_pool_dma_alloc(hcd->localmem_pool, size, dma);
+ /* DMA API ignores zone modifiers, and PIO should go with default */
+ mem_flags &= ~GFP_ZONEMASK;
+
/* some USB hosts just use PIO */
if (!hcd_uses_dma(hcd)) {
*dma = ~(dma_addr_t) 0;
There is no reason to keep GFP zone modifiers in hcd_buffer_alloc(): - PIO mode can use any kernel-addressable memory - dma_alloc_coherent() ignores memory zone bits The only place where GFP zone bits are used is when dma_pool_alloc() needs to allocate a new struct dma_page, but that is an omission rather than intention. Signed-off-by: Petr Tesarik <ptesarik@suse.com> --- drivers/usb/core/buffer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)