From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:40362 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758757AbdAIKcF (ORCPT ); Mon, 9 Jan 2017 05:32:05 -0500 Subject: Patch "usb: xhci-mem: use passed in GFP flags instead of GFP_KERNEL" has been added to the 4.4-stable tree To: dan.carpenter@oracle.com, bigeasy@linutronix.de, gregkh@linuxfoundation.org, mathias.nyman@intel.com Cc: , From: Date: Mon, 09 Jan 2017 11:31:41 +0100 Message-ID: <148395790112245@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled usb: xhci-mem: use passed in GFP flags instead of GFP_KERNEL to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: usb-xhci-mem-use-passed-in-gfp-flags-instead-of-gfp_kernel.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From c95a9f83711bf53faeb4ed9bbb63a3f065613dfb Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 10 Nov 2016 22:33:17 +0300 Subject: usb: xhci-mem: use passed in GFP flags instead of GFP_KERNEL From: Dan Carpenter commit c95a9f83711bf53faeb4ed9bbb63a3f065613dfb upstream. We normally use the passed in gfp flags for allocations, it's just these two which were missed. Fixes: 22d45f01a836 ("usb/xhci: replace pci_*_consistent() with dma_*_coherent()") Cc: Mathias Nyman Signed-off-by: Dan Carpenter Acked-by: Sebastian Andrzej Siewior Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -2436,7 +2436,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, * "physically contiguous and 64-byte (cache line) aligned". */ xhci->dcbaa = dma_alloc_coherent(dev, sizeof(*xhci->dcbaa), &dma, - GFP_KERNEL); + flags); if (!xhci->dcbaa) goto fail; memset(xhci->dcbaa, 0, sizeof *(xhci->dcbaa)); @@ -2532,7 +2532,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, xhci->erst.entries = dma_alloc_coherent(dev, sizeof(struct xhci_erst_entry) * ERST_NUM_SEGS, &dma, - GFP_KERNEL); + flags); if (!xhci->erst.entries) goto fail; xhci_dbg_trace(xhci, trace_xhci_dbg_init, Patches currently in stable-queue which might be from dan.carpenter@oracle.com are queue-4.4/usb-xhci-mem-use-passed-in-gfp-flags-instead-of-gfp_kernel.patch